Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:03:59 +0000 (17:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:03:59 +0000 (17:03 +0200)
commite77b9853ea66ef6c34b04d121c5b3d1afaa33971
treed29ef557ca9f706269711b2a31663d956f237996
parente40ae8cc00ae7e485a64a5b3b40b73dbfd32b631
parenta2941c8cb216bdc144953cace64973f5600ffa2d
Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'

* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
  lavc: move CODEC_FLAG_MV0 to mpegvideo

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/motion_est.c
libavcodec/motion_est_template.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h
libavcodec/version.h