summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-17 21:53:44 +0200
committerwm4 <wm4@nowhere>2014-07-17 21:53:44 +0200
commit9faa131959f4dd5749207f14f78a8a2d2a6c4fa8 (patch)
treee534b97d02f969b01be791981c66540a821888e2
parent11944e0b8336d0a4d03a27b5e91f57b568559449 (diff)
downloadmpv-9faa131959f4dd5749207f14f78a8a2d2a6c4fa8.tar.bz2
mpv-9faa131959f4dd5749207f14f78a8a2d2a6c4fa8.tar.xz
demux: drop some unused definitions
-rw-r--r--demux/demux.h2
-rw-r--r--demux/demux_disc.c1
2 files changed, 0 insertions, 3 deletions
diff --git a/demux/demux.h b/demux/demux.h
index 4ec259d6dc..13180d2ce7 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -46,7 +46,6 @@ enum demuxer_type {
DEMUXER_TYPE_MATROSKA,
DEMUXER_TYPE_EDL,
DEMUXER_TYPE_CUE,
- DEMUXER_TYPE_DISC,
};
// DEMUXER control commands/answers
@@ -60,7 +59,6 @@ enum demux_ctrl {
DEMUXER_CTRL_RESYNC,
DEMUXER_CTRL_IDENTIFY_PROGRAM,
DEMUXER_CTRL_STREAM_CTRL,
- DEMUXER_CTRL_STREAM_AUTOSELECT,
};
struct demux_ctrl_stream_ctrl {
diff --git a/demux/demux_disc.c b/demux/demux_disc.c
index dcb0762cb5..02d52f9c6e 100644
--- a/demux/demux_disc.c
+++ b/demux/demux_disc.c
@@ -352,5 +352,4 @@ const demuxer_desc_t demuxer_desc_disc = {
.close = d_close,
.seek = d_seek,
.control = d_control,
- .type = DEMUXER_TYPE_DISC,
};