From a8cb1746c5b6307b2e820f965a7da8d907893b38 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 5 Dec 2012 19:56:36 +0100 Subject: 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 . CC: libav-stable@libav.org --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec') diff --git a/libavcodec/h264.c b/libavcodec/h264.c index f04d8787b0..942cb15ae0 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2601,7 +2601,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; -- cgit v1.2.3