Silicon Graphics Movie demuxer

Signed-off-by: Vittorio Giovara <[email protected]>
afedchin · Apr 19, 2014 · 55ddd70 · 55ddd70
1 parent 86a0432
commit 55ddd70
Show file tree

Hide file tree

Showing 6 changed files with 473 additions and 1 deletion.
diff --git a/Changelog b/Changelog
@@ -21,6 +21,7 @@ version <next>:
 - asettb filter
 - Silicon Graphics RLE 8-bit video decoder
 - Silicon Graphics Motion Video Compressor 1 & 2 decoder
+- Silicon Graphics Movie demuxer
 
 
 version 10:

diff --git a/doc/general.texi b/doc/general.texi
@@ -383,6 +383,7 @@ library:
 @item SDP                       @tab   @tab X
 @item Sega FILM/CPK             @tab   @tab X
     @tab Used in many Sega Saturn console games.
+@item Silicon Graphics Movie    @tab   @tab X
 @item Sierra SOL                @tab   @tab X
     @tab .sol files used in Sierra Online games.
 @item Sierra VMD                @tab   @tab X

diff --git a/libavformat/Makefile b/libavformat/Makefile
@@ -201,6 +201,7 @@ OBJS-$(CONFIG_MPEGVIDEO_DEMUXER)         += mpegvideodec.o rawdec.o
 OBJS-$(CONFIG_MPJPEG_MUXER)              += mpjpeg.o
 OBJS-$(CONFIG_MSNWC_TCP_DEMUXER)         += msnwc_tcp.o
 OBJS-$(CONFIG_MTV_DEMUXER)               += mtv.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

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
@@ -165,6 +165,7 @@ void av_register_all(void)
     REGISTER_MUXER   (MPJPEG,           mpjpeg);
     REGISTER_DEMUXER (MSNWC_TCP,        msnwc_tcp);
     REGISTER_DEMUXER (MTV,              mtv);
+    REGISTER_DEMUXER (MV,               mv);
     REGISTER_DEMUXER (MVI,              mvi);
     REGISTER_MUXDEMUX(MXF,              mxf);
     REGISTER_MUXER   (MXF_D10,          mxf_d10);