summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-13 17:12:41 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-13 17:12:41 +0000
commit6c0d230fb3c69ec9cb310ac08352d10cf76686dd (patch)
treef41cd038b0655acee31fd7753cf0a884ce116a59 /etc
parenta80b534b5a95c74cbaef82e9c70c962a1a0d0500 (diff)
downloadmpv-6c0d230fb3c69ec9cb310ac08352d10cf76686dd.tar.bz2
mpv-6c0d230fb3c69ec9cb310ac08352d10cf76686dd.tar.xz
Add support for FFmpeg DK3 ADPCM codec and prefer it over MPlayer's
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27277 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf8
1 files changed, 8 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 8d1dacafc7..5e3847d243 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2782,6 +2782,14 @@ audiocodec dk4adpcm
; registered with Microsoft
driver imaadpcm
+audiocodec ffadpcmimadk3
+ info "FFmpeg DK3 IMA ADPCM audio"
+ status working
+ format 0x62 ; This format number was used by Duck Corp. but not officially
+ ; registered with Microsoft
+ driver ffmpeg
+ dll adpcm_ima_dk3
+
audiocodec dk3adpcm
info "Duck DK3 ADPCM (rogue format number)"
status working