# HG changeset patch # User iive # Date 1139909670 0 # Node ID 7b30bef00830dabdafd5504dabe167a13213b7c7 # Parent 22db9136d4f55397a199f3ea58305588a27bfb4c allow autodetection of pictures type when using mf://@file.list syntax autodetection is based on first picture instead of the url diff -r 22db9136d4f5 -r 7b30bef00830 libmpdemux/demux_mf.c --- a/libmpdemux/demux_mf.c Mon Feb 13 12:49:15 2006 +0000 +++ b/libmpdemux/demux_mf.c Tue Feb 14 09:34:30 2006 +0000 @@ -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;