diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-12-05 19:56:36 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2012-12-05 23:16:37 +0100 |
| commit | a8cb1746c5b6307b2e820f965a7da8d907893b38 (patch) | |
| tree | d461f0f84ee23414ecd8426bba5507fc3ba20d73 /libavcodec | |
| parent | 5e1bbb8c7e7008151b36ab0ba253466f3fae64ef (diff) | |
| download | ffmpeg-a8cb1746c5b6307b2e820f965a7da8d907893b38.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 .
CC: libav-stable@libav.org
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 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; |