]> git.sesse.net Git - ffmpeg/commitdiff
lavc/videotoolboxenc: Fix crash when closing codec after error
authorRick Kern <kernrj@gmail.com>
Sun, 20 Mar 2016 16:55:56 +0000 (00:55 +0800)
committerwm4 <nfxjfg@googlemail.com>
Sat, 2 Apr 2016 17:16:15 +0000 (19:16 +0200)
Fixes crash in #5352. VTCompressionSessionInvalidate() crashes if the
internal encoder hasn't completed, but hasn't experienced an error.
The function call isn't needed since the encoder is invalidated when
the reference count reaches 0 anyway.

Signed-off-by: Rick Kern <kernrj@gmail.com>
Signed-off-by: wm4 <nfxjfg@googlemail.com>
libavcodec/videotoolboxenc.c

index 3ed1f646cf4eb9e0740e2c7e4cb143a15cc5757d..07911469f027da1bcd85d953596f17adb978c16a 100644 (file)
@@ -1275,7 +1275,6 @@ static av_cold int vtenc_close(AVCodecContext *avctx)
 
     if(!vtctx->session) return 0;
 
-    VTCompressionSessionInvalidate(vtctx->session);
     pthread_cond_destroy(&vtctx->cv_sample_sent);
     pthread_mutex_destroy(&vtctx->lock);
     CFRelease(vtctx->session);