aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mov.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-01 17:03:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-01 17:03:59 +0200
commite77b9853ea66ef6c34b04d121c5b3d1afaa33971 (patch)
treed29ef557ca9f706269711b2a31663d956f237996 /libavformat/mov.c
parente40ae8cc00ae7e485a64a5b3b40b73dbfd32b631 (diff)
parenta2941c8cb216bdc144953cace64973f5600ffa2d (diff)
downloadffmpeg-e77b9853ea66ef6c34b04d121c5b3d1afaa33971.tar.gz
Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'
* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d': lavc: move CODEC_FLAG_MV0 to mpegvideo Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
0 files changed, 0 insertions, 0 deletions