summaryrefslogtreecommitdiffstats
path: root/player
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 /player
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 'player')
-rw-r--r--player/command.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/player/command.c b/player/command.c
index 742b1fa91a..3df1b3fcd1 100644
--- a/player/command.c
+++ b/player/command.c
@@ -2370,7 +2370,7 @@ static int mp_property_program(void *ctx, struct m_property *prop,
int action, void *arg)
{
MPContext *mpctx = ctx;
- demux_program_t prog;
+ demux_program_t prog = {0};
struct demuxer *demuxer = mpctx->demuxer;
if (!demuxer || !mpctx->playback_initialized)
@@ -2384,7 +2384,7 @@ static int mp_property_program(void *ctx, struct m_property *prop,
else
prog.progid = -1;
if (demux_control(demuxer, DEMUXER_CTRL_IDENTIFY_PROGRAM, &prog) ==
- DEMUXER_CTRL_NOTIMPL)
+ CONTROL_UNKNOWN)
return M_PROPERTY_ERROR;
if (prog.aid < 0 && prog.vid < 0) {