diff options
| author | wm4 <wm4@nowhere> | 2016-09-09 17:44:02 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-09-09 17:54:57 +0200 |
| commit | 04320d26ebb8a9ea2cfba9a7b6ddec0920326233 (patch) | |
| tree | 2908ca8415f17ae9ed687797a9b8acddf8cccf71 /player/loadfile.c | |
| parent | c15764101943e93ea9e8223596d8a6a2571494c3 (diff) | |
| download | mpv-04320d26ebb8a9ea2cfba9a7b6ddec0920326233.tar.bz2 mpv-04320d26ebb8a9ea2cfba9a7b6ddec0920326233.tar.xz | |
stream, demux, config: remove some dead/unneeded option-related code
This has all been made unnecessary recently. The change not to copy the
global option struct in particular can be made because now nothing
accesses the global options anymore in the demux and stream layers.
Some code that was accidentally added/changed in commit 5e30e7a0 is also
removed, because it was simply committed accidentally, and was never
used.
Diffstat (limited to 'player/loadfile.c')
| -rw-r--r-- | player/loadfile.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index b42b8f14e3..8f065e8d07 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -809,7 +809,7 @@ static void open_demux_thread(void *pctx) static void open_demux_reentrant(struct MPContext *mpctx) { struct demux_open_args args = { - .global = create_sub_global(mpctx), + .global = mpctx->global, .cancel = mpctx->playback_abort, .log = mpctx->log, .stream_flags = mpctx->playing->stream_flags, @@ -819,12 +819,10 @@ static void open_demux_reentrant(struct MPContext *mpctx) args.stream_flags = 0; mpctx_run_reentrant(mpctx, open_demux_thread, &args); if (args.demux) { - talloc_steal(args.demux, args.global); mpctx->demuxer = args.demux; enable_demux_thread(mpctx, mpctx->demuxer); } else { mpctx->error_playing = args.err; - talloc_free(args.global); } talloc_free(args.url); } |