summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-29 01:32:03 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-29 01:32:03 +0300
commit4a36b51ea62bae47ea9bf8df3031c88a1992b7a6 (patch)
tree8ade74ff57f052e87f36b763703ffc03af823001 /etc
parentc73217c07a98013887f507849c18eeac1257df58 (diff)
parent45b7b9374bb2a772baa34a52d1abac11c939de15 (diff)
downloadmpv-4a36b51ea62bae47ea9bf8df3031c88a1992b7a6.tar.bz2
mpv-4a36b51ea62bae47ea9bf8df3031c88a1992b7a6.tar.xz
Merge svn changes up to r29455
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index f5aeee3eea..103955c322 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3840,7 +3840,7 @@ audiocodec ffamrnb
fourcc samr
format 0x57 ;amr in avi
driver ffmpeg
- dll "libamr_nb"
+ dll "libopencore_amrnb"
audiocodec ffamrwb
info "AMR Wideband"
@@ -3848,7 +3848,7 @@ audiocodec ffamrwb
fourcc sawb
format 0x58 ;amr in avi
driver ffmpeg
- dll "libamr_wb"
+ dll "libopencore_amrwb"
audiocodec ffadcpmswf
info "FFmpeg's ADPCM Flash-variant"