diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-12 19:41:38 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-12 19:41:38 +0000 |
| commit | 89875edb3286108ef4c0afff8b8b62de16af540a (patch) | |
| tree | 9bc19ab98dcbd4aa9ca7e121f1d41f271d160528 /mencoder.c | |
| parent | d31a1e04f4dd6617c0d46c1c76e8efc6509ba9f1 (diff) | |
| download | mpv-89875edb3286108ef4c0afff8b8b62de16af540a.tar.bz2 mpv-89875edb3286108ef4c0afff8b8b62de16af540a.tar.xz | |
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
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8926 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mencoder.c b/mencoder.c index f395f428ca..6a1bd19414 100644 --- a/mencoder.c +++ b/mencoder.c @@ -391,6 +391,7 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){ if(stream2){ demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2); if(demuxer2) printf(MSGTR_UsingPass3ControllFile,frameno_filename); + else mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); } // New config code @@ -493,6 +494,7 @@ if(stream->type==STREAMTYPE_DVD){ //demuxer=demux_open(stream,file_format,video_id,audio_id,dvdsub_id); demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id); if(!demuxer){ + mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); printf(MSGTR_CannotOpenDemuxer); mencoder_exit(1,NULL); } |