* commit 'a18ef7a7':
  doc: fix a couple of typos in frame.h

Conflicts:
	libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>