Mercurial > mplayer.hg

changeset 35600:f15a80d56c7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support FFmpeg Silicon Graphics Motion Video Compressor 1 and 2.
author cehoyos
date Tue, 18 Dec 2012 00:53:45 +0000
parents 415e59838dc9
children d79291903d2e
files etc/codecs.conf libmpdemux/mp_taglists.c
diffstat 2 files changed, 20 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Tue Dec 18 00:40:37 2012 +0000
+++ b/etc/codecs.conf	Tue Dec 18 00:53:45 2012 +0000
@@ -724,6 +724,22 @@
   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
--- a/libmpdemux/mp_taglists.c	Tue Dec 18 00:40:37 2012 +0000
+++ b/libmpdemux/mp_taglists.c	Tue Dec 18 00:53:45 2012 +0000
@@ -153,6 +153,10 @@
     { 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')},