# HG changeset patch
# User cehoyos
# Date 1329509241 0
# Node ID 3ed6c81c8deed570aa044a74da3045a2fad34246
# Parent  c06bd15f4f3153bd9c91b438c8bfdd6dae1d0f12
Support playback of CDXL files with -demuxer lavf.

diff -r c06bd15f4f31 -r 3ed6c81c8dee etc/codecs.conf
--- a/etc/codecs.conf	Fri Feb 17 02:04:41 2012 +0000
+++ b/etc/codecs.conf	Fri Feb 17 20:07:21 2012 +0000
@@ -118,6 +118,14 @@
   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"
diff -r c06bd15f4f31 -r 3ed6c81c8dee libmpdemux/mp_taglists.c
--- a/libmpdemux/mp_taglists.c	Fri Feb 17 02:04:41 2012 +0000
+++ b/libmpdemux/mp_taglists.c	Fri Feb 17 20:07:21 2012 +0000
@@ -121,6 +121,7 @@
     { 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')},