Mercurial > mplayer.hg
comparison mp3lib/sr1.c @ 30552:8d2b4cef28d3
Add header file for mplayer_audio_read() instead of forward declaring it.
| author | diego |
|---|---|
| date | Tue, 16 Feb 2010 13:16:17 +0000 |
| parents | 347d152a5cfa |
| children | fbb18bfa2dfe |
comparison
equal
deleted
inserted
replaced
| 30551:36818ea5ce95 | 30552:8d2b4cef28d3 |
|---|---|
| 18 #include "mp3.h" | 18 #include "mp3.h" |
| 19 #include "mpbswap.h" | 19 #include "mpbswap.h" |
| 20 #include "cpudetect.h" | 20 #include "cpudetect.h" |
| 21 //#include "liba52/mm_accel.h" | 21 //#include "liba52/mm_accel.h" |
| 22 #include "mp_msg.h" | 22 #include "mp_msg.h" |
| 23 | 23 #include "libmpcodecs/ad_mp3lib.h" |
| 24 #include "libvo/fastmemcpy.h" | 24 #include "libvo/fastmemcpy.h" |
| 25 | 25 |
| 26 #include "libavutil/common.h" | 26 #include "libavutil/common.h" |
| 27 #include "libavutil/internal.h" | 27 #include "libavutil/internal.h" |
| 28 | 28 |
| 53 | 53 |
| 54 static long outscale = 32768; | 54 static long outscale = 32768; |
| 55 #include "tabinit.c" | 55 #include "tabinit.c" |
| 56 | 56 |
| 57 #if 1 | 57 #if 1 |
| 58 int mplayer_audio_read(char *buf,int size); | |
| 59 | |
| 60 LOCAL int mp3_read(char *buf,int size){ | 58 LOCAL int mp3_read(char *buf,int size){ |
| 61 // int len=fread(buf,1,size,mp3_file); | 59 // int len=fread(buf,1,size,mp3_file); |
| 62 int len=mplayer_audio_read(buf,size); | 60 int len=mplayer_audio_read(buf,size); |
| 63 if(len>0) MP3_fpos+=len; | 61 if(len>0) MP3_fpos+=len; |
| 64 // if(len!=size) MP3_eof=1; | 62 // if(len!=size) MP3_eof=1; |