Mercurial > mplayer.hg

changeset 27244:a25810edd65a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for FFmpeg's ADPCM codecs and make them the default
author reimar
date Sun, 13 Jul 2008 17:06:36 +0000
parents e0641ed3cefd
children ccf1f8602a9d
files etc/codecs.conf
diffstat 1 files changed, 31 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Sun Jul 13 16:56:00 2008 +0000
+++ b/etc/codecs.conf	Sun Jul 13 17:06:36 2008 +0000
@@ -2729,6 +2729,21 @@
   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 @@
   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 @@
   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