diff options
| author | Thomas Guillem <thomas@gllm.fr> | 2018-06-11 16:21:17 +0200 |
|---|---|---|
| committer | Aman Gupta <aman@tmm1.net> | 2018-06-18 11:49:38 -0700 |
| commit | 70799fae35d179aa52f04514fb0b431052dc6fcf (patch) | |
| tree | afa895b90f48b2d25317404d0d61d73a1f764a3c | |
| parent | e049f7c24fc6aa5fc925f860e2ad940a75cfd84f (diff) | |
| download | ffmpeg-70799fae35d179aa52f04514fb0b431052dc6fcf.tar.gz | |
avcodec/videotoolboxenc: fix mutex/cond leak in error path
The leak could happen when the vtenc_create_encoder() function failed.
Signed-off-by: Aman Gupta <aman@tmm1.net>
(cherry picked from commit ce2330bdf896458131fcd00f9284c31617adcf01)
| -rw-r--r-- | libavcodec/videotoolboxenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 7796a685c2..9f2a71b15d 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -2473,13 +2473,14 @@ static av_cold int vtenc_close(AVCodecContext *avctx) { VTEncContext *vtctx = avctx->priv_data; + pthread_cond_destroy(&vtctx->cv_sample_sent); + pthread_mutex_destroy(&vtctx->lock); + if(!vtctx->session) return 0; VTCompressionSessionCompleteFrames(vtctx->session, kCMTimeIndefinite); clear_frame_queue(vtctx); - pthread_cond_destroy(&vtctx->cv_sample_sent); - pthread_mutex_destroy(&vtctx->lock); CFRelease(vtctx->session); vtctx->session = NULL; |