diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
| commit | 42bf12c2d3b2903a127f625dea0d3516a87debfa (patch) | |
| tree | 7fe1a2c4a3c250d44b9ff2a8bdf3809104744eb9 /mp3lib | |
| parent | fa34ea27b94cd870ec56de4ce215bf797054119f (diff) | |
| parent | 3c514ea708749679623ae04fc8f7ade87e51aade (diff) | |
| download | mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.bz2 mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.xz | |
Merge svn changes up to r30595
Conflicts:
mplayer.c
vidix/nvidia_vid.c
Diffstat (limited to 'mp3lib')
| -rw-r--r-- | mp3lib/sr1.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index fdbf19ba89..43afb6a674 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -20,7 +20,7 @@ #include "cpudetect.h" //#include "liba52/mm_accel.h" #include "mp_msg.h" - +#include "libmpcodecs/ad_mp3lib.h" #include "libvo/fastmemcpy.h" #include "libavutil/common.h" @@ -51,8 +51,6 @@ static long outscale = 32768; #include "tabinit.c" #if 1 -int mplayer_audio_read(char *buf,int size); - LOCAL int mp3_read(char *buf,int size){ // int len=fread(buf,1,size,mp3_file); int len=mplayer_audio_read(buf,size); |