Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'

* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
  Silicon Graphics Movie demuxer

Conflicts:
	Changelog
	libavformat/mvdec.c
	libavformat/version.h

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

diff --cc libavformat/Makefile
index 514513f642bb760f0630573b3ef147e9ee032ee9,0ef6d83abaa2b9e99477670f873ec82a3b8423be..2b78e73e623f51b27eff395dd21cb538aa232121
--- 1/libavformat/Makefile
--- 2/libavformat/Makefile
+++ b/libavformat/Makefile
@@@ -242,12 -199,10 +242,12 @@@ OBJS-$(CONFIG_MPEGTS_DEMUXER
  OBJS-$(CONFIG_MPEGTS_MUXER)              += mpegtsenc.o
  OBJS-$(CONFIG_MPEGVIDEO_DEMUXER)         += mpegvideodec.o rawdec.o
  OBJS-$(CONFIG_MPJPEG_MUXER)              += mpjpeg.o
 +OBJS-$(CONFIG_MPL2_DEMUXER)              += mpl2dec.o subtitles.o
 +OBJS-$(CONFIG_MPSUB_DEMUXER)             += mpsubdec.o subtitles.o
  OBJS-$(CONFIG_MSNWC_TCP_DEMUXER)         += msnwc_tcp.o
  OBJS-$(CONFIG_MTV_DEMUXER)               += mtv.o
- OBJS-$(CONFIG_MVI_DEMUXER)               += mvi.o
  OBJS-$(CONFIG_MV_DEMUXER)                += mvdec.o
+ OBJS-$(CONFIG_MVI_DEMUXER)               += mvi.o
  OBJS-$(CONFIG_MXF_DEMUXER)               += mxfdec.o mxf.o
  OBJS-$(CONFIG_MXF_MUXER)                 += mxfenc.o mxf.o audiointerleave.o
  OBJS-$(CONFIG_MXG_DEMUXER)               += mxg.o

diff --cc libavformat/mvdec.c
Simple merge

diff --cc libavformat/version.h
index 074f3a36bae24ab472235aacea6f10a880fc3429,b09d49c8189843c545b78391726d9cda45bfe570..cbdb6b3aa30ce329af5edd0170a7823668a0bf97
--- 1/libavformat/version.h
--- 2/libavformat/version.h
+++ b/libavformat/version.h
@@@ -30,8 -30,8 +30,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 55
 -#define LIBAVFORMAT_VERSION_MINOR 16
 -#define LIBAVFORMAT_VERSION_MICRO  0
 +#define LIBAVFORMAT_VERSION_MINOR 37
- #define LIBAVFORMAT_VERSION_MICRO 100
++#define LIBAVFORMAT_VERSION_MICRO 101
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \