Mercurial > mplayer.hg

changeset 31411:bfa89aebee85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move demuxer-related extern variable declarations to demuxer.h.
author diego
date Sun, 20 Jun 2010 14:11:56 +0000
parents 2dc4e130e7ba
children 563f02c25af9
files cfg-common.h libmpdemux/demuxer.h
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-common.h	Sun Jun 20 14:01:43 2010 +0000
+++ b/cfg-common.h	Sun Jun 20 14:11:56 2010 +0000
@@ -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_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;
--- a/libmpdemux/demuxer.h	Sun Jun 20 14:01:43 2010 +0000
+++ b/libmpdemux/demuxer.h	Sun Jun 20 14:11:56 2010 +0000
@@ -175,8 +175,12 @@
 
 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