summaryrefslogtreecommitdiffstats
path: root/demux/demux_disc.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-19 17:54:02 +0200
committerwm4 <wm4@nowhere>2017-06-19 17:56:51 +0200
commitf34e1a0deea45e5ed200f1d8daa36ca92d899e92 (patch)
tree4d28e0521f83ff6771d830f60981f8570b32dea0 /demux/demux_disc.c
parente0c50289d6dc579bcf0eb8dbc9f0a68138d29aa8 (diff)
downloadmpv-f34e1a0deea45e5ed200f1d8daa36ca92d899e92.tar.bz2
mpv-f34e1a0deea45e5ed200f1d8daa36ca92d899e92.tar.xz
demux: replace custom return codes with CONTROL_ ones
This is more uniform, and potentially gets rid of some past copyrights. It might be that this subtly changes caching behavior (it seems before this, it synced to the demuxer if the length was unknown, which is not what we want.)
Diffstat (limited to 'demux/demux_disc.c')
-rw-r--r--demux/demux_disc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/demux/demux_disc.c b/demux/demux_disc.c
index ad54db8c19..f4c9c34332 100644
--- a/demux/demux_disc.c
+++ b/demux/demux_disc.c
@@ -357,14 +357,14 @@ static int d_control(demuxer_t *demuxer, int cmd, void *arg)
if (stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, &len) < 1)
break;
*(double *)arg = len;
- return DEMUXER_CTRL_OK;
+ return CONTROL_OK;
}
case DEMUXER_CTRL_RESYNC:
demux_flush(p->slave);
break; // relay to slave demuxer
case DEMUXER_CTRL_SWITCHED_TRACKS:
reselect_streams(demuxer);
- return DEMUXER_CTRL_OK;
+ return CONTROL_OK;
}
return demux_control(p->slave, cmd, arg);
}