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 16:22:49 +0100 |
| commit | 213f651498483c86097d5e0480a09b975ad1f28c (patch) | |
| tree | 41bdf3848d1677cb6c9bca2004a7e17724bb60f0 | |
| parent | 36982b3616728033ad7868d845cc7438ceef3e76 (diff) | |
| download | ffmpeg-213f651498483c86097d5e0480a09b975ad1f28c.tar.gz | |
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>
| -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 54540e67f2..7632e95a86 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2868,7 +2868,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; |