From a80b534b5a95c74cbaef82e9c70c962a1a0d0500 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 13 Jul 2008 17:06:36 +0000
Subject: Add support for FFmpeg's ADPCM codecs and make them the default

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27276 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index f6ad1812bd..8d1dacafc7 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2729,6 +2729,21 @@ audiocodec ffadpcmimaamv
   driver ffmpeg
   dll adpcm_ima_amv
 
+audiocodec ffadpcmimaqt
+  info "FFmpeg QT IMA ADPCM audio"
+  status working
+  format 0x34616d69  ; "ima4" (MOV files)
+  driver ffmpeg
+  dll adpcm_ima_qt
+
+audiocodec ffadpcmimawav
+  info "FFmpeg WAV IMA ADPCM audio"
+  status working
+  format 0x11
+  format 0x1100736d ; "ms\x00\x11" (MOV files)
+  driver ffmpeg
+  dll adpcm_ima_wav
+
 audiocodec imaadpcm
   info "IMA ADPCM"
   status working
@@ -2737,6 +2752,14 @@ audiocodec imaadpcm
   format 0x1100736d ; "ms\x00\x11" (MOV files)
   driver imaadpcm
 
+audiocodec ffadpcmms
+  info "FFmpeg MS ADPCM audio"
+  status working
+  format 0x2
+  format 0x0200736d  ; "ms\x00\x02" (MOV files)
+  driver ffmpeg
+  dll adpcm_ms
+
 audiocodec msadpcm
   info "MS ADPCM"
   status working
@@ -2744,6 +2767,14 @@ audiocodec msadpcm
   format 0x0200736d  ; "ms\x00\x02" (MOV files)
   driver msadpcm
 
+audiocodec ffadpcmimadk4
+  info "FFmpeg DK4 IMA ADPCM audio"
+  status working
+  format 0x61 ; This format number was used by Duck Corp. but not officially
+              ; registered with Microsoft
+  driver ffmpeg
+  dll adpcm_ima_dk4
+
 audiocodec dk4adpcm
   info "Duck DK4 ADPCM (rogue format number)"
   status working
-- 
cgit v1.2.3