[MPlayer-cvslog] r31477 - in trunk: cfg-common.h libmpdemux/demuxer.h

[diego]

Author: diego
Date: Sun Jun 20 16:11:56 2010
New Revision: 31477

Log:
Move demuxer-related extern variable declarations to demuxer.h.

Modified:
   trunk/cfg-common.h
   trunk/libmpdemux/demuxer.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Sun Jun 20 16:01:43 2010	(r31476)
+++ trunk/cfg-common.h	Sun Jun 20 16:11:56 2010	(r31477)
@@ -30,6 +30,7 @@
 #include "libmpcodecs/dec_video.h"
 #include "libmpcodecs/vd.h"
 #include "libmpdemux/demux_ts.h"
+#include "libmpdemux/demuxer.h"
 #include "osdep/priority.h"
 #include "stream/network.h"
 #include "stream/stream_dvd_common.h"
@@ -44,8 +45,6 @@ extern const m_option_t demux_rawaudio_o
 extern const m_option_t demux_rawvideo_opts[];
 extern const m_option_t cdda_opts[];
 
-extern char* sub_stream;
-extern int demuxer_type, audio_demuxer_type, sub_demuxer_type;
 extern off_t ps_probe;
 
 extern int sws_flags;

Modified: trunk/libmpdemux/demuxer.h
==============================================================================
--- trunk/libmpdemux/demuxer.h	Sun Jun 20 16:01:43 2010	(r31476)
+++ trunk/libmpdemux/demuxer.h	Sun Jun 20 16:11:56 2010	(r31477)
@@ -175,8 +175,12 @@ typedef struct demuxer_info {
 
 struct demuxer;
 
+extern int demuxer_type;
+extern int audio_demuxer_type;
+extern int sub_demuxer_type;
 extern int correct_pts;
 extern int user_correct_pts;
+extern char *sub_stream;
 
 /**
  * Demuxer description structure