diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:11:04 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:11:04 +0300 |
commit | 95fba94860a02be5b50c4050f9ba2ac41daea3c2 (patch) | |
tree | 79ebb3fb8b351e8347c092e62331cd50b2a06a7b /etc/codecs.conf | |
parent | 3c2d6d9a8e28900300d20830c309eea2d511cfc8 (diff) | |
parent | 0426d5d72df81217f32147d039f3eb29c009af12 (diff) | |
download | mpv-95fba94860a02be5b50c4050f9ba2ac41daea3c2.tar.bz2 mpv-95fba94860a02be5b50c4050f9ba2ac41daea3c2.tar.xz |
Merge svn changes up to r30917
Diffstat (limited to 'etc/codecs.conf')
-rw-r--r-- | etc/codecs.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 2c5a89e44d..0d5fdba29d 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -4316,7 +4316,7 @@ audiocodec musepack format 0x2b4d driver mpcdec -audiocodec ffamrnb +audiocodec libopencoreamrnb info "AMR Narrowband" status working fourcc samr @@ -4324,7 +4324,7 @@ audiocodec ffamrnb driver ffmpeg dll "libopencore_amrnb" -audiocodec ffamrwb +audiocodec libopencoreamrwb info "AMR Wideband" status working fourcc sawb |