[MPlayer-cvslog] CVS: main/libmpdemux demux_mf.c,1.16,1.17

[Ivan Kalvachev CVS]

CVS change done by Ivan Kalvachev CVS

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

Modified Files:
	demux_mf.c 
Log Message:
allow autodetection of pictures type when using mf://@file.list syntax
autodetection is based on first picture instead of the url


Index: demux_mf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mf.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- demux_mf.c	9 Feb 2006 19:39:51 -0000	1.16
+++ demux_mf.c	14 Feb 2006 09:34:30 -0000	1.17
@@ -68,8 +68,12 @@
   
   if(!demuxer->stream->url) return NULL;
 
+
+  mf=open_mf(demuxer->stream->url + 5);
+  if(!mf) return NULL;
+
   if(!mf_type){
-    char* p=strrchr(demuxer->stream->url,'.');
+    char* p=strrchr(mf->names[0],'.');
     if(!p){
       mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] file type was not set! (try -mf type=xxx)\n" );
       free( mf ); return NULL;
@@ -78,8 +82,6 @@
     mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] file type was not set! trying 'type=%s'...\n", mf_type);
   }
 
-  mf=open_mf(demuxer->stream->url + 5);
-  if(!mf) return NULL;
   mf->curr_frame=0;
 
   demuxer->movi_start = 0;