[MPlayer-cvslog] r35694 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c

[cehoyos]

Author: cehoyos
Date: Tue Dec 18 01:53:45 2012
New Revision: 35694

Log:
Support FFmpeg Silicon Graphics Motion Video Compressor 1 and 2.

Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Tue Dec 18 01:40:37 2012	(r35693)
+++ trunk/etc/codecs.conf	Tue Dec 18 01:53:45 2012	(r35694)
@@ -724,6 +724,22 @@ videocodec sgi
   driver sgi
   out BGR24
 
+videocodec ffmvc1
+  info "FFmpeg SGI Motion Video Compressor 1"
+  status working
+  fourcc mvc1 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll mvc1
+  out BGR15
+
+videocodec ffmvc2
+  info "FFmpeg SGI Motion Video Compressor 2"
+  status working
+  fourcc mvc2 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll mvc2
+  out BGRA
+
 videocodec ffsunras
   info "FFmpeg SUN Rasterfile"
   status working

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Tue Dec 18 01:40:37 2012	(r35693)
+++ trunk/libmpdemux/mp_taglists.c	Tue Dec 18 01:53:45 2012	(r35694)
@@ -153,6 +153,10 @@ static const struct AVCodecTag mp_bmp_ta
     { CODEC_ID_MDEC,              MKTAG('M', 'D', 'E', 'C')},
     { CODEC_ID_MMVIDEO,           MKTAG('M', 'M', 'V', ' ')},
     { CODEC_ID_MOTIONPIXELS,      MKTAG('M', 'V', 'I', '1')},
+#if LIBAVUTIL_VERSION_MICRO >= 100
+    { AV_CODEC_ID_MVC1,           MKTAG('m', 'v', 'c', '1')},
+    { AV_CODEC_ID_MVC2,           MKTAG('m', 'v', 'c', '2')},
+#endif
     { CODEC_ID_MXPEG,             MKTAG('M', 'X', 'P', 'G')},
     { CODEC_ID_NUV,               MKTAG('N', 'U', 'V', '1')},
     { CODEC_ID_RL2,               MKTAG('R', 'L', '2', 'V')},