diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-08-10 13:23:04 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:15:48 +0200 |
commit | a62d145bdf549bbd90a97b9fc39385a13ea0471d (patch) | |
tree | aac36242728b4c46e83321cda8a1bc48a06653fc /mencoder.c | |
parent | fb46c7bdbea4548f830843deffdd6136cb39e9f9 (diff) | |
download | mpv-a62d145bdf549bbd90a97b9fc39385a13ea0471d.tar.bz2 mpv-a62d145bdf549bbd90a97b9fc39385a13ea0471d.tar.xz |
Simplify code: make open_stream() accept NULL file_format argument
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31952 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r-- | mencoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c index 2c4f203317..960799f67f 100644 --- a/mencoder.c +++ b/mencoder.c @@ -667,7 +667,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ if (frameno_filename) { - stream2=open_stream(frameno_filename,0,&i); + stream2=open_stream(frameno_filename, NULL, NULL); if(stream2){ demuxer2=demux_open(&opts, stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL); if(demuxer2) mp_tmsg(MSGT_MENCODER, MSGL_INFO, "Using pass3 control file: %s\n", frameno_filename); |