Merge commit 'ded5957d'

* commit 'ded5957d':
  segafilm: Remove deplanarization hack

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

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

libavformat/version.h

@@ -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, \