[FFmpeg-cvslog] Merge commit '92ebb332157195b7c1212e734c5668afbf19cf2b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 19 20:39:05 2014 +0100| [bd9e0127c9fbfc18f1a663483d9388d69a1581f6] | committer: Michael Niedermayer

Merge commit '92ebb332157195b7c1212e734c5668afbf19cf2b'

* commit '92ebb332157195b7c1212e734c5668afbf19cf2b':
  mxf: Add additional H264 PictureEssenceCoding

Conflicts:
	libavformat/mxf.c

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

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