diff options
| -rw-r--r-- | etc/codecs.conf | 15 | ||||
| -rw-r--r-- | libmpdemux/demux_lavf.c | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 7a194e9efa..4a4cdac963 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1938,6 +1938,14 @@ videocodec ffvmd 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 @@ audiocodec ffsmkaud 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 --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 10e7866192..47649f6f46 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -74,6 +74,7 @@ int64_t ff_gcd(int64_t a, int64_t b); 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_wav_tags[] = { }; 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')}, |