# HG changeset patch
# User diego
# Date 1283968535 0
# Node ID b429f2102412db19c83d0091c77c2523f115676f
# Parent  4229b325910e0616fe28f80ac52029d698151aaa
Refactor *demuxer_name extern declarations to demuxer.h.

diff -r 4229b325910e -r b429f2102412 libmpdemux/demuxer.h
--- a/libmpdemux/demuxer.h	Wed Sep 08 17:52:32 2010 +0000
+++ b/libmpdemux/demuxer.h	Wed Sep 08 17:55:35 2010 +0000
@@ -182,6 +182,10 @@
 extern int audio_stream_cache;
 extern int correct_pts;
 extern int user_correct_pts;
+
+extern char *demuxer_name;
+extern char *audio_demuxer_name;
+extern char *sub_demuxer_name;
 extern char *sub_stream;
 
 extern int rtsp_port;
diff -r 4229b325910e -r b429f2102412 mencoder.c
--- a/mencoder.c	Wed Sep 08 17:52:32 2010 +0000
+++ b/mencoder.c	Wed Sep 08 17:55:35 2010 +0000
@@ -130,9 +130,6 @@
 static char** video_codec_list=NULL;  // override video codec
 static char** audio_fm_list=NULL;     // override audio codec family
 static char** video_fm_list=NULL;     // override video codec family
-extern char *demuxer_name; // override demuxer
-extern char *audio_demuxer_name; // override audio demuxer
-extern char *sub_demuxer_name; // override sub demuxer
 
 static int out_audio_codec=-1;
 static int out_video_codec=-1;
diff -r 4229b325910e -r b429f2102412 mplayer.c
--- a/mplayer.c	Wed Sep 08 17:52:32 2010 +0000
+++ b/mplayer.c	Wed Sep 08 17:55:35 2010 +0000
@@ -240,11 +240,6 @@
 char **audio_fm_list=NULL;    // override audio codec family
 char **video_fm_list=NULL;    // override video codec family
 
-// demuxer:
-extern char *demuxer_name; // override demuxer
-extern char *audio_demuxer_name; // override audio demuxer
-extern char *sub_demuxer_name; // override sub demuxer
-
 // streaming:
 int audio_id=-1;
 int video_id=-1;