h264: slice-mt: get last_pic_dropable from master context
authorJanne Grunau <janne-libav@jannau.net>
Wed, 5 Dec 2012 18:56:36 +0000 (19:56 +0100)
committerReinhard Tartler <siretart@tauware.de>
Sat, 12 Jan 2013 16:59:40 +0000 (17:59 +0100)
Fixes fate-h264-conformance-cvnlfi2_sony_h and smllwebdl.mkv from
https://github.com/OpenELEC/OpenELEC.tv/issues/1557 .

CC: libav-stable@libav.org
(cherry picked from commit a8cb1746c5b6307b2e820f965a7da8d907893b38)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
libavcodec/h264.c

index c9940da..97b2115 100644 (file)
@@ -2866,7 +2866,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;