From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 1 May 2014 15:03:59 +0000 (+0200)
Subject: Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'
X-Git-Tag: n2.4-dev~1412
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/e77b9853ea66ef6c34b04d121c5b3d1afaa33971

Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'

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

Conflicts:
	libavcodec/version.h

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

e77b9853ea66ef6c34b04d121c5b3d1afaa33971
diff --cc libavcodec/version.h
index a13d479,79428cf..cd2b0d8
--- a/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, \