[FFmpeg-cvslog] Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  9 23:34:33 2014 +0200| [f233666880afd1f2c0b9902c762df7a8733510a8] | committer: Michael Niedermayer

Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'

* commit '650d384048ed42579cc6d67bf32a94b468c0b6cb':
  yuv4mpegenc: do not access AVCodecContext.coded_frame

Conflicts:
	libavformat/yuv4mpegenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f233666880afd1f2c0b9902c762df7a8733510a8
---