summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-09 17:44:02 +0200
committerwm4 <wm4@nowhere>2016-09-09 17:54:57 +0200
commit04320d26ebb8a9ea2cfba9a7b6ddec0920326233 (patch)
tree2908ca8415f17ae9ed687797a9b8acddf8cccf71 /demux
parentc15764101943e93ea9e8223596d8a6a2571494c3 (diff)
downloadmpv-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 'demux')
-rw-r--r--demux/demux_edl.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/demux/demux_edl.c b/demux/demux_edl.c
index f4968905bd..67a4290303 100644
--- a/demux/demux_edl.c
+++ b/demux/demux_edl.c
@@ -28,7 +28,6 @@
#include "demux.h"
#include "timeline.h"
#include "common/msg.h"
-#include "common/global.h"
#include "options/path.h"
#include "misc/bstr.h"
#include "common/common.h"