# HG changeset patch
# User cehoyos
# Date 1320518336 0
# Node ID aafe86a9a6e852317d7c69c414afd904ad555508
# Parent  66cdad95f543a428b209129cadf8361333f156a9
Support Chronomaster DFA decoding (bug 2006).

diff -r 66cdad95f543 -r aafe86a9a6e8 etc/codecs.conf
--- a/etc/codecs.conf	Sat Nov 05 18:20:44 2011 +0000
+++ b/etc/codecs.conf	Sat Nov 05 18:38:56 2011 +0000
@@ -3486,6 +3486,14 @@
   dll c93
   out BGR8
 
+videocodec ffdfa
+  info "FFmpeg Chronomaster DFA"
+  status working
+  fourcc CDFA ; internal MPlayer FourCC
+  driver ffmpeg
+  dll dfa
+  out BGR8
+
 videocodec ffeatgv
   info "FFmpeg Electronic Arts TGV"
   status working
diff -r 66cdad95f543 -r aafe86a9a6e8 libmpdemux/mp_taglists.c
--- a/libmpdemux/mp_taglists.c	Sat Nov 05 18:20:44 2011 +0000
+++ b/libmpdemux/mp_taglists.c	Sat Nov 05 18:38:56 2011 +0000
@@ -109,6 +109,7 @@
     { CODEC_ID_BFI,               MKTAG('B', 'F', 'I', 'V')},
     { CODEC_ID_C93,               MKTAG('C', '9', '3', 'V')},
     { CODEC_ID_CDGRAPHICS,        MKTAG('C', 'D', 'G', 'R')},
+    { CODEC_ID_DFA,               MKTAG('C', 'D', 'F', 'A')},
     { CODEC_ID_DNXHD,             MKTAG('A', 'V', 'd', 'n')},
     { CODEC_ID_DSICINVIDEO,       MKTAG('D', 'C', 'I', 'V')},
     { CODEC_ID_DXA,               MKTAG('D', 'X', 'A', '1')},