h264: only assign H264Picture::mbaff for first slice.
authorRonald S. Bultje <rsbultje@gmail.com>
Wed, 29 Mar 2017 13:33:47 +0000 (09:33 -0400)
committerRonald S. Bultje <rsbultje@gmail.com>
Fri, 31 Mar 2017 12:26:24 +0000 (08:26 -0400)
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.

libavcodec/h264_direct.c

index 4e7202b..a7a107c 100644 (file)
@@ -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;