From caa956090a2d7b62790217b08c0a8dd108c71aef Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 16 Feb 2010 13:16:17 +0000 Subject: [PATCH] Add header file for mplayer_audio_read() instead of forward declaring it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30594 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_mp3lib.c | 1 + libmpcodecs/ad_mp3lib.h | 24 ++++++++++++++++++++++++ mp3lib/sr1.c | 4 +--- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 libmpcodecs/ad_mp3lib.h diff --git a/libmpcodecs/ad_mp3lib.c b/libmpcodecs/ad_mp3lib.c index 5b50557c96..f262757526 100644 --- a/libmpcodecs/ad_mp3lib.c +++ b/libmpcodecs/ad_mp3lib.c @@ -23,6 +23,7 @@ #include "config.h" #include "ad_internal.h" +#include "ad_mp3lib.h" static const ad_info_t info = { diff --git a/libmpcodecs/ad_mp3lib.h b/libmpcodecs/ad_mp3lib.h new file mode 100644 index 0000000000..aeb78b4ed8 --- /dev/null +++ b/libmpcodecs/ad_mp3lib.h @@ -0,0 +1,24 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_AD_MP3LIB_H +#define MPLAYER_AD_MP3LIB_H + +int mplayer_audio_read(char *buf, int size); + +#endif /* MPLAYER_AD_MP3LIB_H */ diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index 77ba630453..ee9e336877 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" @@ -55,8 +55,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);