Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 21:34:33 +0000 (23:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 21:34:33 +0000 (23:34 +0200)
commitf233666880afd1f2c0b9902c762df7a8733510a8
tree43199954cc71aa822c1d0fb2b73fda2edf411e60
parent57fa9e97424de601a5f10ad7bfc6ce48597c783f
parent650d384048ed42579cc6d67bf32a94b468c0b6cb
Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'

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

Conflicts:
libavformat/yuv4mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/yuv4mpegenc.c