[FFmpeg-cvslog] h264: slice-mt: get last_pic_dropable from master context

[Janne Grunau]

ffmpeg | branch: release/1.0 | Janne Grunau <janne-libav at jannau.net> | Wed Dec  5 19:56:36 2012 +0100| [e31ace670ef927dd9433f7f1e3373fb447b00551] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e31ace670ef927dd9433f7f1e3373fb447b00551
---

 libavcodec/h264.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index ec3afea..3b91039 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2669,7 +2669,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;