ffmpeg | branch: master | Ronald S. Bultje <rsbul...@gmail.com> | Mon Apr 3
22:28:22 2017 -0400| [7c7e7c44a6eb68eca861e45cb2ce78f582b12c69] | committer:
Ronald S. Bultje
huffyuv: assign correct per-thread avctx pointer to HYuvContext::avctx.
Fixes the following tsan warning when running fate-vsynth_lena-ffvhuff:
WARNING: ThreadSanitizer: data race (pid=6484)
Write of size 8 at 0x7d64000154b8 by main thread (mutexes: write M1331):
#0 update_context_from_user src/libavcodec/pthread_frame.c:331
(ffmpeg+0x000000dca887)
[..]
Previous read of size 8 at 0x7d64000154b8 by thread T2 (mutexes: write M1334):
#0 draw_slice src/libavcodec/huffyuvdec.c:857 (ffmpeg+0x000000bcc86f)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c7e7c44a6eb68eca861e45cb2ce78f582b12c69
---
libavcodec/huffyuvdec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index 5572b98..979c4b9 100644
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -579,6 +579,8 @@ static av_cold int decode_init_thread_copy(AVCodecContext
*avctx)
HYuvContext *s = avctx->priv_data;
int i, ret;
+ s->avctx = avctx;
+
if ((ret = ff_huffyuv_alloc_temp(s)) < 0) {
ff_huffyuv_common_end(s);
return ret;
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
