[MPlayer-cvslog] CVS: main cfg-common.h, 1.147, 1.148 mencoder.c, 1.304, 1.305 mplayer.c, 1.858, 1.859

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv13381

Modified Files:
	cfg-common.h mencoder.c mplayer.c 
Log Message:
Demuxer modularization
Demuxer selection by name with -demuxer command (bakward compatible)


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- cfg-common.h	31 Jul 2005 00:26:04 -0000	1.147
+++ cfg-common.h	5 Aug 2005 19:57:44 -0000	1.148
@@ -113,9 +113,9 @@
 	{ "audiofile", &audio_stream, CONF_TYPE_STRING, 0, 0, 0, NULL },
 	{ "audiofile-cache", &audio_stream_cache, CONF_TYPE_INT, CONF_RANGE, 50, 65536, NULL},
 	{ "subfile", &sub_stream, CONF_TYPE_STRING, 0, 0, 0, NULL },
-	{ "demuxer", &demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL },
-	{ "audio-demuxer", &audio_demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL },
-	{ "sub-demuxer", &sub_demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL },
+	{ "demuxer", &demuxer_name, CONF_TYPE_STRING, 0, 0, 0, NULL },
+	{ "audio-demuxer", &audio_demuxer_name, CONF_TYPE_STRING, 0, 0, 0, NULL },
+	{ "sub-demuxer", &sub_demuxer_name, CONF_TYPE_STRING, 0, 0, 0, NULL },
 	{ "extbased", &extension_parsing, CONF_TYPE_FLAG, 0, 0, 1, NULL },
 	{ "noextbased", &extension_parsing, CONF_TYPE_FLAG, 0, 1, 0, NULL },
 

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- mencoder.c	1 Aug 2005 20:16:55 -0000	1.304
+++ mencoder.c	5 Aug 2005 19:57:44 -0000	1.305
@@ -115,6 +115,9 @@
 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;

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.858
retrieving revision 1.859
diff -u -r1.858 -r1.859
--- mplayer.c	31 Jul 2005 00:26:04 -0000	1.858
+++ mplayer.c	5 Aug 2005 19:57:44 -0000	1.859
@@ -249,6 +249,11 @@
 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;
@@ -1268,6 +1273,13 @@
       exit_player_with_rc(NULL, 0);
     }
 #endif
+    if((demuxer_name && strcmp(demuxer_name,"help")==0) ||
+       (audio_demuxer_name && strcmp(audio_demuxer_name,"help")==0) ||
+       (sub_demuxer_name && strcmp(sub_demuxer_name,"help")==0)){
+      demuxer_help();
+      mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n");
+      exit_player_with_rc(NULL, 0);
+    }
 
 #ifdef USE_EDL
 if (edl_check_mode() == EDL_ERROR && edl_filename)