summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-17 12:35:36 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-17 12:35:36 +0000
commit0426d5d72df81217f32147d039f3eb29c009af12 (patch)
treeca095d2377714f1b40af53d5ea19b542281b25db /etc
parent8e8387f7bd4de7fd53c526bf51813463617548a4 (diff)
downloadmpv-0426d5d72df81217f32147d039f3eb29c009af12.tar.bz2
mpv-0426d5d72df81217f32147d039f3eb29c009af12.tar.xz
Rename libopencore AMR decoder entries.
FFmpeg now has an AMR-NB decoder, this avoids name clashes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30917 b3059339-0415-0410-9bf9-f77b7e298cf2
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 1ae01939ad..01b3b5a086 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4317,7 +4317,7 @@ audiocodec musepack
format 0x2b4d
driver mpcdec
-audiocodec ffamrnb
+audiocodec libopencoreamrnb
info "AMR Narrowband"
status working
fourcc samr
@@ -4325,7 +4325,7 @@ audiocodec ffamrnb
driver ffmpeg
dll "libopencore_amrnb"
-audiocodec ffamrwb
+audiocodec libopencoreamrwb
info "AMR Wideband"
status working
fourcc sawb