[vlc-devel] [PATCH 1/9] demux: mkv: Demux: return VLC_DEMUXER_EGENERIC on error

[Steve Lhomme]

LGTM


On 2018-07-16 5:19, Filip Roséen wrote:
> 0 is equivalent to VLC_DEMUXER_EOF, which is not correct if we abort
> due to an error.
> ---
>   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 af6554dcb2..7e1b49a28d 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 0;
> +            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 0;
> +                return VLC_DEMUXER_EGENERIC;
>               }
>   
>               p_sys->i_pcr = i_pcr;
> -- 
> 2.18.0
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel