[MPlayer-cvslog] r20956 - in trunk: etc/codecs.conf libmpdemux/demux_lavf.c

[diego]

Author: diego
Date: Thu Nov 16 13:28:39 2006
New Revision: 20956

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

Log:
support for Delphine CIN audio and video


Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Thu Nov 16 13:28:39 2006
@@ -1938,6 +1938,14 @@
   dll "vmdvideo"
   out BGR8
 
+videocodec ffdsicinvideo
+  info "FFmpeg Delphine CIN video"
+  status working
+  fourcc DCIV ; internal MPlayer FourCC
+  driver ffmpeg
+  dll "dsicinvideo"
+  out BGR8
+
 
 ; raw formats:  (now RGB formats are autodetected)
 
@@ -2442,6 +2450,13 @@
   driver ffmpeg
   dll "smackaud"
 
+audiocodec ffdsicinaudio
+  info "FFmpeg Delphine CIN audio"
+  status working
+  fourcc DCIA ; internal MPlayer FourCC
+  driver ffmpeg
+  dll dsicinaudio
+
 audiocodec ff4xmadmpcm
   info "FFmpeg 4XM ADPCM audio"
   status working

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	(original)
+++ trunk/libmpdemux/demux_lavf.c	Thu Nov 16 13:28:39 2006
@@ -74,6 +74,7 @@
 const CodecTag mp_wav_tags[] = {
     { CODEC_ID_ADPCM_4XM,     MKTAG('4', 'X', 'M', 'A')},
     { CODEC_ID_ADPCM_IMA_WS,  MKTAG('A', 'I', 'W', 'S')},
+    { CODEC_ID_DSICINAUDIO,   MKTAG('D', 'C', 'I', 'A')},
     { CODEC_ID_INTERPLAY_DPCM,MKTAG('I', 'N', 'P', 'A')},
     { CODEC_ID_PCM_S24BE,     MKTAG('i', 'n', '2', '4')},
     { CODEC_ID_PCM_S8,        MKTAG('t', 'w', 'o', 's')},
@@ -84,6 +85,7 @@
 };
 
 const CodecTag mp_bmp_tags[] = {
+    { CODEC_ID_DSICINVIDEO,       MKTAG('D', 'C', 'I', 'V')},
     { CODEC_ID_TIERTEXSEQVIDEO,   MKTAG('T', 'S', 'E', 'Q')},
     { CODEC_ID_VMDVIDEO,          MKTAG('V', 'M', 'D', 'V')},
     { CODEC_ID_XAN_WC3,           MKTAG('W', 'C', '3', 'V')},