Merge commit 'ded5957d75def70d2f1fc1c1eae079230004974b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jun 2015 18:50:44 +0000 (20:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jun 2015 18:51:22 +0000 (20:51 +0200)
* commit 'ded5957d75def70d2f1fc1c1eae079230004974b':
  segafilm: Remove deplanarization hack

Conflicts:
libavformat/segafilm.c
libavformat/version.h

See: 42b8f5fba1f067c55231791039283e41b5167247
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/version.h

index 0ace5b5..16c4e7b 100644 (file)
@@ -31,7 +31,7 @@
 
 #define LIBAVFORMAT_VERSION_MAJOR 56
 #define LIBAVFORMAT_VERSION_MINOR  38
-#define LIBAVFORMAT_VERSION_MICRO 101
+#define LIBAVFORMAT_VERSION_MICRO 102
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \