diff options
author | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-14 09:34:30 +0000 |
---|---|---|
committer | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-14 09:34:30 +0000 |
commit | 0aa37a0db23c74555c9b79a45ab135b091cf3b84 (patch) | |
tree | e7f870eddbea00de61caf65927ffa5addcaa1a8b /libmpdemux | |
parent | 05e6f3c5779bac03226e4420d224e5e2836e05be (diff) | |
download | mpv-0aa37a0db23c74555c9b79a45ab135b091cf3b84.tar.bz2 mpv-0aa37a0db23c74555c9b79a45ab135b091cf3b84.tar.xz |
allow autodetection of pictures type when using mf://@file.list syntax
autodetection is based on first picture instead of the url
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17625 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_mf.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c index 5139640faa..415ff0a68b 100644 --- a/libmpdemux/demux_mf.c +++ b/libmpdemux/demux_mf.c @@ -68,8 +68,12 @@ static demuxer_t* demux_open_mf(demuxer_t* demuxer){ 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 @@ static demuxer_t* demux_open_mf(demuxer_t* demuxer){ 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; |