ffmpeg | branch: master | Ronald S. Bultje <rsbul...@gmail.com> | Wed Mar 29 09:33:47 2017 -0400| [1ddc37051f11bd4bbadbcd17ea49b76a965d6a47] | committer: Ronald S. Bultje
h264: only assign H264Picture::mbaff for first slice. The value must be identical between slices, since mbaff depends on picture_structure and sps, both of which are checked to be identical to the first slice before this point. In practice, this silences some tsan warnings in fate-h264. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ddc37051f11bd4bbadbcd17ea49b76a965d6a47 --- libavcodec/h264_direct.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 4e7202b..a7a107c 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -138,7 +138,11 @@ void ff_h264_direct_ref_list_init(const H264Context *const h, H264SliceContext * memcpy(cur->ref_poc[1], cur->ref_poc[0], sizeof(cur->ref_poc[0])); } - cur->mbaff = FRAME_MBAFF(h); + if (h->current_slice == 0) { + cur->mbaff = FRAME_MBAFF(h); + } else { + av_assert0(cur->mbaff == FRAME_MBAFF(h)); + } sl->col_fieldoff = 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog