From 6d83d2a6d59092892a9db4fcc4b462ea45fb945d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Filip=20Ros=C3=A9en?= Date: Mon, 16 Jul 2018 05:19:49 +0200 Subject: [PATCH] demux: mkv: Demux: return VLC_DEMUXER_EGENERIC on error VLC_DEMUXER_EOF is not correct if we abort due to an error. Signed-off-by: Steve Lhomme --- modules/demux/mkv/mkv.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp index efd6587912..407bc50013 100644 --- a/modules/demux/mkv/mkv.cpp +++ b/modules/demux/mkv/mkv.cpp @@ -753,7 +753,7 @@ static int Demux( demux_t *p_demux) { msg_Err( p_demux, "invalid track number" ); delete block; - return VLC_DEMUXER_EOF; + return VLC_DEMUXER_EGENERIC; } mkv_track_t &track = *p_track; @@ -801,7 +801,7 @@ static int Demux( demux_t *p_demux) if( es_out_SetPCR( p_demux->out, i_pcr ) ) { msg_Err( p_demux, "ES_OUT_SET_PCR failed, aborting." ); - return VLC_DEMUXER_EOF; + return VLC_DEMUXER_EGENERIC; } p_sys->i_pcr = i_pcr; -- 2.11.4.GIT