[vlc-commits] videotoolbox: fix Restart not flusing outputFrames/Timestamps
Thomas Guillem
git at videolan.org
Wed Jan 18 15:19:04 CET 2017
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Jan 9 14:39:13 2017 +0100| [65e150bcb6a13af18de0b6017bc6b6114a0d5c76] | committer: Thomas Guillem
videotoolbox: fix Restart not flusing outputFrames/Timestamps
b_started was set to false before Flush() from RestartVideoToolbox(). Now that
these objects are always valid, we can clean-up without checking the state.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=65e150bcb6a13af18de0b6017bc6b6114a0d5c76
---
modules/codec/videotoolbox.m | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m
index a5b2d1c..8db64b8 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -985,12 +985,10 @@ static void Flush(decoder_t *p_dec)
{
decoder_sys_t *p_sys = p_dec->p_sys;
- if (likely(p_sys->b_started)) {
- vlc_mutex_lock(&p_sys->outLock);
- [p_sys->outputTimeStamps removeAllObjects];
- [p_sys->outputFrames removeAllObjects];
- vlc_mutex_unlock(&p_sys->outLock);
- }
+ vlc_mutex_lock(&p_sys->outLock);
+ [p_sys->outputTimeStamps removeAllObjects];
+ [p_sys->outputFrames removeAllObjects];
+ vlc_mutex_unlock(&p_sys->outLock);
}
static picture_t *DecodeBlock(decoder_t *p_dec, block_t **pp_block)
More information about the vlc-commits
mailing list