vlc | branch: master | Thomas Guillem <[email protected]> | Mon Apr 24 17:44:05 2017 +0200| [3bd31b34ee2ae9537ad0cb8cd6ad047fab79f6ba] | committer: Thomas Guillem
videotoolbox: remove goto reload > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3bd31b34ee2ae9537ad0cb8cd6ad047fab79f6ba --- modules/codec/videotoolbox.m | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m index dd5b8c8609..ced2175f1d 100644 --- a/modules/codec/videotoolbox.m +++ b/modules/codec/videotoolbox.m @@ -1270,7 +1270,10 @@ static int DecodeBlock(decoder_t *p_dec, block_t *p_block) vlc_mutex_lock(&p_sys->lock); if (p_sys->b_abort) { /* abort from output thread (DecoderCallback) */ vlc_mutex_unlock(&p_sys->lock); - goto reload; + /* Add an empty variable so that videotoolbox won't be loaded again for + * this ES */ + var_Create(p_dec, "videotoolbox-failed", VLC_VAR_VOID); + return VLCDEC_RELOAD; } vlc_mutex_unlock(&p_sys->lock); @@ -1383,12 +1386,6 @@ skip: free(p_info); block_Release(p_block); return VLCDEC_SUCCESS; - -reload: - /* Add an empty variable so that videotoolbox won't be loaded again for - * this ES */ - var_Create(p_dec, "videotoolbox-failed", VLC_VAR_VOID); - return VLCDEC_RELOAD; } static int UpdateVideoFormat(decoder_t *p_dec, CVPixelBufferRef imageBuffer) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
