Commit d59b81a8 authored by Thomas Guillem's avatar Thomas Guillem

dvdnav: Fix demux returning success in case or error

It happened when StreamProbeDVD succeeded and when dvdnav_open_stream failed.

Fixes #14300
parent 0dce302d
...@@ -445,7 +445,7 @@ static int DemuxOpen ( vlc_object_t *p_this ) ...@@ -445,7 +445,7 @@ static int DemuxOpen ( vlc_object_t *p_this )
{ {
demux_t *p_demux = (demux_t*)p_this; demux_t *p_demux = (demux_t*)p_this;
dvdnav_t *p_dvdnav = NULL; dvdnav_t *p_dvdnav = NULL;
int i_ret; int i_ret = VLC_EGENERIC;
int64_t i_init_pos; int64_t i_init_pos;
bool forced = false, b_seekable = false; bool forced = false, b_seekable = false;
...@@ -463,7 +463,7 @@ static int DemuxOpen ( vlc_object_t *p_this ) ...@@ -463,7 +463,7 @@ static int DemuxOpen ( vlc_object_t *p_this )
i_init_pos = stream_Tell( p_demux->s ); i_init_pos = stream_Tell( p_demux->s );
/* Try some simple probing to avoid going through dvdnav_open too often */ /* Try some simple probing to avoid going through dvdnav_open too often */
if( !forced && (i_ret = StreamProbeDVD( p_demux->s )) != VLC_SUCCESS ) if( !forced && StreamProbeDVD( p_demux->s ) != VLC_SUCCESS )
goto bailout; goto bailout;
static dvdnav_stream_cb stream_cb = static dvdnav_stream_cb stream_cb =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment