summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-06-30 09:55:14 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:11:46 +0200
commitd86aad3d5643c1e4ea287868fcaaff9adf684a03 (patch)
tree299c3ae87fe2a8998e0a20f749ca8990616a241a /etc
parenta701c81f6dacaab94ab832c171f7230cd1f8e933 (diff)
downloadmpv-d86aad3d5643c1e4ea287868fcaaff9adf684a03.tar.bz2
mpv-d86aad3d5643c1e4ea287868fcaaff9adf684a03.tar.xz
ad_mpg123: add MP3 decoding through libmpg123
patch by Thomas Orgis, thomas-forum orgis org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31590 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf15
1 files changed, 15 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index c723ebd2cf..7e912e3afd 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4163,6 +4163,21 @@ audiocodec mp3
fourcc "LAME" ; used in mythtv .nuv files
driver mp3lib
+audiocodec mpg123
+ ; this is preferred over ffmp2/ffmp3 since it is faster, generally
+ info "MPEG 1.0/2.0/2.5 layers I, II, III"
+ status working
+ comment "High-performance decoder using libmpg123."
+ format 0x50 ; layer-1 && layer-2
+ format 0x55 ; layer-3
+ format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
+ format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files)
+ format 0x55005354 ; broken file
+ fourcc ".mp3" ; CBR/VBR MP3 (MOV files)
+ fourcc "MP3 " ; used in .nsv files
+ fourcc "LAME" ; used in mythtv .nuv files
+ driver mpg123
+
audiocodec ffmp3on4float
info "FFmpeg Multi-channel MPEG layer-3 on MP4 audio"
status working