diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-19 00:21:54 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-19 00:21:54 +0000 |
| commit | 970435ce12de15022db3f920b293799462dd7518 (patch) | |
| tree | 61d49faf24e71afdf7b097ba2431cbe7bb4974b8 /mencoder.c | |
| parent | 721a0b6362bd129bfccc9541030df14abe86405a (diff) | |
| download | mpv-970435ce12de15022db3f920b293799462dd7518.tar.bz2 mpv-970435ce12de15022db3f920b293799462dd7518.tar.xz | |
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
inspired by patch by Fabian Franz <FabianFranz@gmx.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9007 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mencoder.c b/mencoder.c index 4b6cfe7cfc..48d65dcbd3 100644 --- a/mencoder.c +++ b/mencoder.c @@ -389,7 +389,7 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){ // FIXME: get rid of -dvd and other tricky options stream2=open_stream(frameno_filename,0,&i); if(stream2){ - demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2); + demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL); if(demuxer2) printf(MSGTR_UsingPass3ControllFile,frameno_filename); else mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); } @@ -492,7 +492,7 @@ if(stream->type==STREAMTYPE_DVD){ if(demuxer2) audio_id=-2; /* do NOT read audio packets... */ //demuxer=demux_open(stream,file_format,video_id,audio_id,dvdsub_id); - demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id); + demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id,filename); if(!demuxer){ mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); printf(MSGTR_CannotOpenDemuxer); |