[MPlayer-cvslog] r31484 - in trunk: cfg-common.h libmpdemux/demux_audio.c libmpdemux/demux_audio.h libmpdemux/demuxer.c

[diego]

Author: diego
Date: Sun Jun 20 17:04:12 2010
New Revision: 31484

Log:
Move hr_mp3_seek extern variable declaration to demux_audio.h.

Added:
   trunk/libmpdemux/demux_audio.h
Modified:
   trunk/cfg-common.h
   trunk/libmpdemux/demux_audio.c
   trunk/libmpdemux/demuxer.c

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Sun Jun 20 17:00:11 2010	(r31483)
+++ trunk/cfg-common.h	Sun Jun 20 17:04:12 2010	(r31484)
@@ -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 network_prefer_ipv4;
 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[];
 

Modified: trunk/libmpdemux/demux_audio.c
==============================================================================
--- trunk/libmpdemux/demux_audio.c	Sun Jun 20 17:00:11 2010	(r31483)
+++ trunk/libmpdemux/demux_audio.c	Sun Jun 20 17:04:12 2010	(r31484)
@@ -28,6 +28,8 @@
 #include "stheader.h"
 #include "genres.h"
 #include "mp3_hdr.h"
+#include "demux_audio.h"
+
 #include "libavutil/intreadwrite.h"
 
 #include <string.h>

Added: trunk/libmpdemux/demux_audio.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libmpdemux/demux_audio.h	Sun Jun 20 17:04:12 2010	(r31484)
@@ -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 */

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	Sun Jun 20 17:00:11 2010	(r31483)
+++ trunk/libmpdemux/demuxer.c	Sun Jun 20 17:04:12 2010	(r31484)
@@ -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 *demuxer_name = NULL;       // para
 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;