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)
* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
  lavc: move CODEC_FLAG_MV0 to mpegvideo

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
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

diff --cc doc/APIchanges
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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, \