Mercurial > mplayer.hg
comparison libmpdemux/demuxer.c @ 8925:5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
after all demuxers failed. so -playlist is not needed any more!
patch by Fabian Franz <FabianFranz@gmx.de>, with some small modifications
author | arpi |
---|---|
date | Sun, 12 Jan 2003 19:41:38 +0000 |
parents | 76ec79da7a5c |
children | 497e3b284a10 |
comparison
equal
deleted
inserted
replaced
8924:e0ec616c5985 | 8925:5c15777f1c07 |
---|---|
880 if(file_format==DEMUXER_TYPE_RTP) { | 880 if(file_format==DEMUXER_TYPE_RTP) { |
881 demuxer=new_demuxer(stream,DEMUXER_TYPE_RTP,audio_id,video_id,dvdsub_id); | 881 demuxer=new_demuxer(stream,DEMUXER_TYPE_RTP,audio_id,video_id,dvdsub_id); |
882 } | 882 } |
883 //=============== Unknown, exiting... =========================== | 883 //=============== Unknown, exiting... =========================== |
884 if(file_format==DEMUXER_TYPE_UNKNOWN || demuxer == NULL){ | 884 if(file_format==DEMUXER_TYPE_UNKNOWN || demuxer == NULL){ |
885 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); | 885 //mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); // will be done by mplayer.c after fallback to playlist-parsing |
886 return NULL; | 886 return NULL; |
887 // GUI_MSG( mplUnknowFileType ) | 887 // GUI_MSG( mplUnknowFileType ) |
888 } | 888 } |
889 //====== File format recognized, set up these for compatibility: ========= | 889 //====== File format recognized, set up these for compatibility: ========= |
890 d_audio=demuxer->audio; | 890 d_audio=demuxer->audio; |