[FFmpeg-cvslog] avcodec/dnxhdenc: do not free nonexistent slice threads data when frame threading is used
Paul B Mahol
git at videolan.org
Fri Jun 1 12:01:05 EEST 2018
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Jun 1 10:54:39 2018 +0200| [0d35413e5dbe304bafbe48b1057785ced44de71f] | committer: Paul B Mahol
avcodec/dnxhdenc: do not free nonexistent slice threads data when frame threading is used
Forgotten in 28e9ba951d1a0b0aca53b242aa64f484ca75e874.
Fixes #7241.
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d35413e5dbe304bafbe48b1057785ced44de71f
---
libavcodec/dnxhdenc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 86e71ca8b0..01e22e7764 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -1369,8 +1369,10 @@ static av_cold int dnxhd_encode_end(AVCodecContext *avctx)
av_freep(&ctx->qmatrix_c16);
av_freep(&ctx->qmatrix_l16);
- for (i = 1; i < avctx->thread_count; i++)
- av_freep(&ctx->thread[i]);
+ if (avctx->active_thread_type == FF_THREAD_SLICE) {
+ for (i = 1; i < avctx->thread_count; i++)
+ av_freep(&ctx->thread[i]);
+ }
return 0;
}
More information about the ffmpeg-cvslog
mailing list