summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 03:18:42 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 03:18:42 +0200
commit0269d22d32fb380e7128ca0c60f6f1638c6dab70 (patch)
tree53ba64153d9ef930f73458138478a6d0def381ce /etc
parent240550bbb94653907faa6e0bb1c5ac3d279cc252 (diff)
parent97ef28ad9aa2f34aea0779062976ad4294c0af51 (diff)
downloadmpv-0269d22d32fb380e7128ca0c60f6f1638c6dab70.tar.bz2
mpv-0269d22d32fb380e7128ca0c60f6f1638c6dab70.tar.xz
Merge svn changes up to r30876
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf7
1 files changed, 7 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index f78c2ea32c..d52e7c7a3d 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3677,6 +3677,13 @@ audiocodec raatrcmac
driver realaud
dll "atrc.bundle/Contents/MacOS/atrc"
+audiocodec ffadpcmadx
+ info "FFmpeg SEGA CRI adx codec"
+ status working
+ fourcc Sadx ; internal MPlayer FourCC
+ driver ffmpeg
+ dll adpcm_adx
+
audiocodec ffadpcmimaamv
info "FFmpeg AMV IMA ADPCM audio"
status working