diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-12-05 22:56:36 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 19:44:49 +0400 |
| commit | 69cc119d64e1071dba25c6cf3d03998f8c22959d (patch) | |
| tree | cae64ade5af07fb1365e38c4ee124fb0e22ae305 /libavcodec | |
| parent | 54ac3d10d158923ead4750d36e1c9773349a5e74 (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 .
(cherry picked from commit 24c62ea7a5df44804be88150aa0c45e6796b5da9)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 22f5527f6f..94c4399c3c 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3133,7 +3133,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; |