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

[cehoyos]

Author: cehoyos
Date: Fri Feb 17 21:07:21 2012
New Revision: 34732

Log:
Support playback of CDXL files with -demuxer lavf.

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Fri Feb 17 03:04:41 2012	(r34731)
+++ trunk/etc/codecs.conf	Fri Feb 17 21:07:21 2012	(r34732)
@@ -118,6 +118,14 @@ videocodec ffzmbv
   dll "zmbv"
   out RGB24
 
+videocodec ffcdxl
+  info "FFmpeg CDXL"
+  status working
+  fourcc CDXL ; internal MPlayer FourCC
+  driver ffmpeg
+  dll cdxl
+  out BGR24,BGR8
+
 videocodec geov
   info "GeoCodec"
   comment "crashes without -nosound, hangs on exit"

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Fri Feb 17 03:04:41 2012	(r34731)
+++ trunk/libmpdemux/mp_taglists.c	Fri Feb 17 21:07:21 2012	(r34732)
@@ -121,6 +121,7 @@ static const struct AVCodecTag mp_bmp_ta
     { CODEC_ID_BMV_VIDEO,         MKTAG('B', 'M', 'V', 'V')},
     { CODEC_ID_C93,               MKTAG('C', '9', '3', 'V')},
     { CODEC_ID_CDGRAPHICS,        MKTAG('C', 'D', 'G', 'R')},
+    { CODEC_ID_CDXL,              MKTAG('C', 'D', 'X', 'L')},
     { CODEC_ID_CMV,               MKTAG('M', 'V', 'I', 'f')},
     { CODEC_ID_DFA,               MKTAG('C', 'D', 'F', 'A')},
     { CODEC_ID_DNXHD,             MKTAG('A', 'V', 'd', 'n')},