Mercurial > mplayer.hg
changeset 3833:dd5ae1d5ea42
asf<->y4m detection swapped
| author | arpi |
|---|---|
| date | Fri, 28 Dec 2001 16:49:10 +0000 |
| parents | d05cfaf5f0f2 |
| children | bc85116eaf5e |
| files | libmpdemux/demuxer.c |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Fri Dec 28 13:56:04 2001 +0000 +++ b/libmpdemux/demuxer.c Fri Dec 28 16:49:10 2001 +0000 @@ -415,6 +415,14 @@ } } } +//=============== 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); + if(y4m_check_file(demuxer)){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected YUV4MPEG2 file format!\n"); + 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); @@ -423,14 +431,6 @@ 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); - if(y4m_check_file(demuxer)){ - mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected YUV4MPEG2 file format!\n"); - file_format=DEMUXER_TYPE_Y4M; - } -} //=============== 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);