RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "codecs: prefer libmad over libmpg123" 

This reverts commit c8b0f21154.

This was a very bad idea. It caused A/V desync with some crappy AVI
files, and upon inspecting ad_mad.c, it seems all hope is lost.
Go back to the prefering the mpg123 & libav codecs.
This commit is contained in:
wm4 2012-08-02 20:56:02 +02:00
parent 32ff1fac14
commit 751333eb63
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
etc/codecs.conf
View File

@ -4160,18 +4160,6 @@ audiocodec ffsonic
driver ffmpeg driver ffmpeg
dll "sonic" dll "sonic"
audiocodec mad
info "libMAD MPEG layer 1-2-3"
status working
format 0x50
format 0x55
format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
fourcc ".mp3" ; CBR/VBR MP3 (MOV files)
fourcc "MP3 " ; used in .nsv files
fourcc "LAME" ; used in mythtv .nuv files
driver libmad
dll "libmad"
audiocodec mpg123 audiocodec mpg123
; this is preferred over ffmp2/ffmp3 since it is faster, generally ; this is preferred over ffmp2/ffmp3 since it is faster, generally
info "MPEG 1.0/2.0/2.5 layers I, II, III" info "MPEG 1.0/2.0/2.5 layers I, II, III"
@ -4269,6 +4257,18 @@ audiocodec ffmp2
driver ffmpeg driver ffmpeg
dll "mp2" dll "mp2"
audiocodec mad
info "libMAD MPEG layer 1-2-3"
status working
format 0x50
format 0x55
format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
fourcc ".mp3" ; CBR/VBR MP3 (MOV files)
fourcc "MP3 " ; used in .nsv files
fourcc "LAME" ; used in mythtv .nuv files
driver libmad
dll "libmad"
audiocodec mp3acm audiocodec mp3acm
info "MPEG layer-3" info "MPEG layer-3"
status working status working