vlc | branch: master | Francois Cartegnie <[email protected]> | Fri Oct 27 11:20:35 2017 +0200| [b6754b3a4cba1b2868241fc78e9aed2ceeb99a35] | committer: Francois Cartegnie
input: fix dialog error message on subtitle demux fallback > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b6754b3a4cba1b2868241fc78e9aed2ceeb99a35 --- src/input/input.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/input/input.c b/src/input/input.c index f79d2d6a5e..f03448445b 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -3294,9 +3294,10 @@ static int input_SlaveSourceAdd( input_thread_t *p_input, b_forced ); input_source_t *p_source = InputSourceNew( p_input, psz_uri, - psz_forced_demux, b_can_fail ); + psz_forced_demux, + b_can_fail || psz_forced_demux ); - if( i_type == SLAVE_TYPE_SPU && p_source == NULL ) + if( psz_forced_demux && p_source == NULL ) p_source = InputSourceNew( p_input, psz_uri, NULL, b_can_fail ); if( p_source == NULL ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
