vlc | branch: master | Thomas Guillem <[email protected]> | Thu Jan 14 12:01:34 2021 +0100| [283145ed4d9f9033d9f9f563c6f77fef6271334f] | committer: Thomas Guillem
decoder: fix abort on vout failure Don't notify the format changed if the output creation failed. Regression from 0abed25515a492896c89cf36ab1e4befc7dd23b6 Fixes #25387 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=283145ed4d9f9033d9f9f563c6f77fef6271334f --- src/input/decoder.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/input/decoder.c b/src/input/decoder.c index f2f643fb65..d475f3d207 100644 --- a/src/input/decoder.c +++ b/src/input/decoder.c @@ -2545,6 +2545,14 @@ bool vlc_input_decoder_HasFormatChanged( vlc_input_decoder_t *p_owner, return false; vlc_mutex_lock( &p_owner->lock ); + + if( p_owner->fmt.i_cat == UNKNOWN_ES ) + { + /* The format changed but the output creation failed */ + vlc_mutex_unlock( &p_owner->lock ); + return false; + } + if( p_fmt != NULL ) es_format_Copy( p_fmt, &p_owner->fmt ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
