[MPlayer-cvslog] r32077 - in trunk: libmpdemux/demuxer.h mencoder.c mplayer.c

[diego]

Author: diego
Date: Wed Sep  8 19:55:35 2010
New Revision: 32077

Log:
Refactor *demuxer_name extern declarations to demuxer.h.

Modified:
   trunk/libmpdemux/demuxer.h
   trunk/mencoder.c
   trunk/mplayer.c

Modified: trunk/libmpdemux/demuxer.h
==============================================================================
--- trunk/libmpdemux/demuxer.h	Wed Sep  8 19:52:32 2010	(r32076)
+++ trunk/libmpdemux/demuxer.h	Wed Sep  8 19:55:35 2010	(r32077)
@@ -182,6 +182,10 @@ extern int sub_demuxer_type;
 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;

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Wed Sep  8 19:52:32 2010	(r32076)
+++ trunk/mencoder.c	Wed Sep  8 19:55:35 2010	(r32077)
@@ -130,9 +130,6 @@ static char** audio_codec_list=NULL;  //
 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;

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Sep  8 19:52:32 2010	(r32076)
+++ trunk/mplayer.c	Wed Sep  8 19:55:35 2010	(r32077)
@@ -240,11 +240,6 @@ char **video_codec_list=NULL; // overrid
 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;