# HG changeset patch # User diego # Date 1277046252 0 # Node ID d2fd0e4d0b9a0082c7a7de810c627d6f713194e4 # Parent ca9623cfa117ec2301f38a74b3736623c30f6b41 Move hr_mp3_seek extern variable declaration to demux_audio.h. diff -r ca9623cfa117 -r d2fd0e4d0b9a cfg-common.h --- a/cfg-common.h Sun Jun 20 15:00:11 2010 +0000 +++ b/cfg-common.h Sun Jun 20 15:04:12 2010 +0000 @@ -30,6 +30,7 @@ #include "libmpcodecs/dec_video.h" #include "libmpcodecs/vd.h" #include "libmpcodecs/vf_scale.h" +#include "libmpdemux/demux_audio.h" #include "libmpdemux/demux_mpg.h" #include "libmpdemux/demux_ts.h" #include "libmpdemux/demux_viv.h" @@ -48,7 +49,6 @@ extern int reuse_socket; /* defined in libmpdemux: */ -extern int hr_mp3_seek; extern const m_option_t demux_rawaudio_opts[]; extern const m_option_t demux_rawvideo_opts[]; diff -r ca9623cfa117 -r d2fd0e4d0b9a libmpdemux/demux_audio.c --- a/libmpdemux/demux_audio.c Sun Jun 20 15:00:11 2010 +0000 +++ b/libmpdemux/demux_audio.c Sun Jun 20 15:04:12 2010 +0000 @@ -28,6 +28,8 @@ #include "stheader.h" #include "genres.h" #include "mp3_hdr.h" +#include "demux_audio.h" + #include "libavutil/intreadwrite.h" #include diff -r ca9623cfa117 -r d2fd0e4d0b9a libmpdemux/demux_audio.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libmpdemux/demux_audio.h Sun Jun 20 15:04:12 2010 +0000 @@ -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_DEMUX_AUDIO_H +#define MPLAYER_DEMUX_AUDIO_H + +extern int hr_mp3_seek; + +#endif /* MPLAYER_DEMUX_AUDIO_H */ diff -r ca9623cfa117 -r d2fd0e4d0b9a libmpdemux/demuxer.c --- a/libmpdemux/demuxer.c Sun Jun 20 15:00:11 2010 +0000 +++ b/libmpdemux/demuxer.c Sun Jun 20 15:04:12 2010 +0000 @@ -38,6 +38,7 @@ #include "demuxer.h" #include "stheader.h" #include "mf.h" +#include "demux_audio.h" #include "libaf/af_format.h" #include "libmpcodecs/dec_teletext.h" @@ -1091,8 +1092,6 @@ char *audio_demuxer_name = NULL; // parameter from -audio-demuxer char *sub_demuxer_name = NULL; // parameter from -sub-demuxer -extern int hr_mp3_seek; - extern float stream_cache_min_percent; extern float stream_cache_seek_min_percent;