Browse Source

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.
tags/n3.3
Ronald S. Bultje 8 years ago
parent
commit
1ddc37051f
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      libavcodec/h264_direct.c

+ 5
- 1
libavcodec/h264_direct.c View 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;



Loading…
Cancel
Save