diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-28 16:49:10 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-28 16:49:10 +0000 |
| commit | b06e33b5f526f6490dc93fa4d3494048a9cbd440 (patch) | |
| tree | 200dc29f7d78cdcf808ad2a32b4af563c9e07a6f /libmpdemux | |
| parent | 0c4138440d91db5ce6a36e60c5616c427b1619ec (diff) | |
| download | mpv-b06e33b5f526f6490dc93fa4d3494048a9cbd440.tar.bz2 mpv-b06e33b5f526f6490dc93fa4d3494048a9cbd440.tar.xz | |
asf<->y4m detection swapped
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3834 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demuxer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 78b3baa8df..faf6b9ac68 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -415,14 +415,6 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){ } } } -//=============== Try to open as ASF file: ================= -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){ - demuxer=new_demuxer(stream,DEMUXER_TYPE_ASF,audio_id,video_id,dvdsub_id); - if(asf_check_header(demuxer)){ - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedASFfile); - file_format=DEMUXER_TYPE_ASF; - } -} //=============== Try to open as Y4M file: ================= if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){ demuxer=new_demuxer(stream,DEMUXER_TYPE_Y4M,audio_id,video_id,dvdsub_id); @@ -431,6 +423,14 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){ file_format=DEMUXER_TYPE_Y4M; } } +//=============== Try to open as ASF file: ================= +if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){ + demuxer=new_demuxer(stream,DEMUXER_TYPE_ASF,audio_id,video_id,dvdsub_id); + if(asf_check_header(demuxer)){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedASFfile); + file_format=DEMUXER_TYPE_ASF; + } +} //=============== Try to open as NUV file: ================= if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_NUV){ demuxer=new_demuxer(stream,DEMUXER_TYPE_NUV,audio_id,video_id,dvdsub_id); |