Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'

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

Conflicts:
	libavcodec/version.h

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

diff --cc doc/APIchanges
Simple merge

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/motion_est.c
Simple merge

diff --cc libavcodec/motion_est_template.c
Simple merge

diff --cc libavcodec/mpegvideo.h
Simple merge

diff --cc libavcodec/mpegvideo_enc.c
Simple merge

diff --cc libavcodec/options_table.h
Simple merge

diff --cc libavcodec/version.h
index a13d479026ff7271dc6ec68b6b6a964c185f9037,79428cf8647611b4f04c4dad945389862e741ed5..cd2b0d89c3f5e09162827672a1f1d9e2d9c2bed5
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 55
 -#define LIBAVCODEC_VERSION_MINOR 50
 -#define LIBAVCODEC_VERSION_MICRO  3
 +#define LIBAVCODEC_VERSION_MINOR  60
- #define LIBAVCODEC_VERSION_MICRO 102
++#define LIBAVCODEC_VERSION_MICRO 103
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \