[Mplayer-cvslog] CVS: main cfg-common.h,1.78,1.79 mencoder.c,1.201,1.202 mplayer.c,1.656,1.657

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv23880

Modified Files:
	cfg-common.h mencoder.c mplayer.c 
Log Message:
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
inspired by patch by Fabian Franz <FabianFranz at gmx.de>


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- cfg-common.h	10 Jan 2003 22:53:33 -0000	1.78
+++ cfg-common.h	19 Jan 2003 00:21:39 -0000	1.79
@@ -83,6 +83,8 @@
 	{ "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 },
+	{ "extbased", &extension_parsing, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+	{ "noextbased", &extension_parsing, CONF_TYPE_FLAG, 0, 1, 0, NULL },
 
         {"mf", mfopts_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL},
 #ifdef USE_TV

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- mencoder.c	18 Jan 2003 19:29:45 -0000	1.201
+++ mencoder.c	19 Jan 2003 00:21:39 -0000	1.202
@@ -389,7 +389,7 @@
   // FIXME: get rid of -dvd and other tricky options
   stream2=open_stream(frameno_filename,0,&i);
   if(stream2){
-    demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2);
+    demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL);
     if(demuxer2) printf(MSGTR_UsingPass3ControllFile,frameno_filename);
     else mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized);
   }
@@ -492,7 +492,7 @@
   if(demuxer2) audio_id=-2; /* do NOT read audio packets... */
 
   //demuxer=demux_open(stream,file_format,video_id,audio_id,dvdsub_id);
-  demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id);
+  demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id,filename);
   if(!demuxer){
         mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized);
 	printf(MSGTR_CannotOpenDemuxer);

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.656
retrieving revision 1.657
diff -u -r1.656 -r1.657
--- mplayer.c	18 Jan 2003 19:29:45 -0000	1.656
+++ mplayer.c	19 Jan 2003 00:21:39 -0000	1.657
@@ -1227,7 +1227,7 @@
 
 current_module="demux_open";
 
-demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id);
+demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id,filename);
 
 // HACK to get MOV Reference Files working