diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-16 04:23:38 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:41:05 +0300 |
| commit | 7039bc090a250f8102ca2c719181dbbc5a74ae79 (patch) | |
| tree | eda5cfd29c6a51d295659411553eaf6a5e6ff48e /mencoder.c | |
| parent | d3d12332d647d2e9281220b84050518bc3f0cb03 (diff) | |
| download | mpv-7039bc090a250f8102ca2c719181dbbc5a74ae79.tar.bz2 mpv-7039bc090a250f8102ca2c719181dbbc5a74ae79.tar.xz | |
Add option pointer to demuxers and stheader.h structs
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 3e86b9e1cc..1da498fff8 100644 --- a/mencoder.c +++ b/mencoder.c @@ -519,7 +519,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ if (frameno_filename) { stream2=open_stream(frameno_filename,0,&i); if(stream2){ - demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL); + demuxer2=demux_open(&opts, stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL); if(demuxer2) mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_UsingPass3ControlFile, frameno_filename); else mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); } @@ -605,7 +605,7 @@ if(stream->type==STREAMTYPE_DVDNAV){ 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,filename); + demuxer=demux_open(&opts, stream,file_format,audio_id,video_id,dvdsub_id,filename); if(!demuxer){ mp_msg(MSGT_DEMUXER, MSGL_FATAL, MSGTR_FormatNotRecognized); mp_msg(MSGT_DEMUXER, MSGL_FATAL, MSGTR_CannotOpenDemuxer); |