diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-15 02:59:27 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-15 02:59:27 +0300 |
| commit | 92f0cba26b5c032f8b097f525862233d92a02a2d (patch) | |
| tree | dc8d255a3a866db1bf89d1065c813b8a0fd51006 /etc | |
| parent | 06c533b167c37540b578fb1c70d2acb44ce59245 (diff) | |
| parent | cf8d38125537f2b77d2321e7d19d5957bab56669 (diff) | |
| download | mpv-92f0cba26b5c032f8b097f525862233d92a02a2d.tar.bz2 mpv-92f0cba26b5c032f8b097f525862233d92a02a2d.tar.xz | |
Merge svn changes up to r27281
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index f6ad1812bd..5e3847d243 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 @@ -2751,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 |