diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-12-05 19:56:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 04:44:57 +0100 |
| commit | 24c62ea7a5df44804be88150aa0c45e6796b5da9 (patch) | |
| tree | 8b215d4288084056feb4e39ff33954f8f38faf7f /libavcodec/h264.c | |
| parent | 7885fa7685c0085e42495482e6b79310f8d66dbc (diff) | |
h264: slice-mt: get last_pic_dropable from master context
Fixes fate-h264-conformance-cvnlfi2_sony_h and smllwebdl.mkv from
https://github.com/OpenELEC/OpenELEC.tv/issues/1557 .
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 618acb74b2..a93d07ebce 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2682,7 +2682,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) h->mb_mbaff = 0; h->mb_aff_frame = 0; last_pic_structure = s0->picture_structure; - last_pic_dropable = s->dropable; + last_pic_dropable = s0->dropable; s->dropable = h->nal_ref_idc == 0; if (h->sps.frame_mbs_only_flag) { s->picture_structure = PICT_FRAME; |