# HG changeset patch # User diego # Date 1163680119 0 # Node ID 7b56f3f4fa803f875b202c1e81e00165c91875f2 # Parent da93e0635a9021e6f9f7be9ba011bb74055c3411 support for Delphine CIN audio and video diff -r da93e0635a90 -r 7b56f3f4fa80 etc/codecs.conf --- a/etc/codecs.conf Thu Nov 16 11:24:45 2006 +0000 +++ b/etc/codecs.conf Thu Nov 16 12:28:39 2006 +0000 @@ -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 diff -r da93e0635a90 -r 7b56f3f4fa80 libmpdemux/demux_lavf.c --- a/libmpdemux/demux_lavf.c Thu Nov 16 11:24:45 2006 +0000 +++ b/libmpdemux/demux_lavf.c Thu Nov 16 12:28:39 2006 +0000 @@ -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')},