]> git.sesse.net Git - ffmpeg/commit
Merge commit '92ebb332157195b7c1212e734c5668afbf19cf2b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Mar 2014 19:39:05 +0000 (20:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Mar 2014 19:39:05 +0000 (20:39 +0100)
commitbd9e0127c9fbfc18f1a663483d9388d69a1581f6
tree982ca15574c5bfe5614e615e67b723ed09c60774
parentdde16f5aaed327e15049b40a8dfae1f59647e4ec
parent92ebb332157195b7c1212e734c5668afbf19cf2b
Merge commit '92ebb332157195b7c1212e734c5668afbf19cf2b'

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

Conflicts:
libavformat/mxf.c

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