[FFmpeg-cvslog] h264: don't write to source picture object in ff_h264_ref_picture().

Ronald S. Bultje git at videolan.org
Fri Mar 31 15:26:48 EEST 2017


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Wed Mar 29 09:03:49 2017 -0400| [b5300c8ad8c5384ab3654d6cb27693422bc424e7] | committer: Ronald S. Bultje

h264: don't write to source picture object in ff_h264_ref_picture().

Doing so is analogous to writing to source data in memcpy(), and causes
(harmless) tsan warnings in fate-h264.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5300c8ad8c5384ab3654d6cb27693422bc424e7
---

 libavcodec/h264_picture.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c
index f634d2a..db96737 100644
--- a/libavcodec/h264_picture.c
+++ b/libavcodec/h264_picture.c
@@ -70,8 +70,8 @@ int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src)
 
     av_assert0(!dst->f->buf[0]);
     av_assert0(src->f->buf[0]);
+    av_assert0(src->tf.f == src->f);
 
-    src->tf.f = src->f;
     dst->tf.f = dst->f;
     ret = ff_thread_ref_frame(&dst->tf, &src->tf);
     if (ret < 0)



More information about the ffmpeg-cvslog mailing list