summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-23 06:35:36 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-23 13:48:38 +0300
commitf518cf7ea99e9282508f551ecb43892f6aabcbc4 (patch)
tree76c85c7cdbb4d1e10679faf86c4bf8336598d6bc /mplayer.c
parent9e7dfe3fa34ca05fb63cd34369f7c847b777516d (diff)
downloadmpv-f518cf7ea99e9282508f551ecb43892f6aabcbc4.tar.bz2
mpv-f518cf7ea99e9282508f551ecb43892f6aabcbc4.tar.xz
Add option pointer to stream struct (at least temporarily)
The stream code does not access many option variables directly, but it does access some such as audio_id and network_bandwidth (and does that without including proper headers for them). Add option pointer to the stream struct to allow access to those variables. Remove the unused (always NULL) and clumsy-looking char** options parameter in the open_stream call and replace it with the option pointer. The parameter is currently only set in the main open_stream() call in MPlayer.c and not in any other locations that can open a stream. In the long term it might be better to pass a more limited set of values somehow, but this should do for now.
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index 5e00156f7a..b1e3c8dbcc 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3150,7 +3150,7 @@ if (edl_output_filename) {
mpctx->sh_video=NULL;
current_module="open_stream";
- mpctx->stream=open_stream(filename,0,&mpctx->file_format);
+ mpctx->stream = open_stream(filename, opts, &mpctx->file_format);
if(!mpctx->stream) { // error...
mpctx->eof = libmpdemux_was_interrupted(mpctx, PT_NEXT_ENTRY);
goto goto_next_file;