diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-12-05 19:56:36 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-01-12 17:59:40 +0100 |
| commit | 1d98811b957db3a4c8a3774e85cf8eb07c03c2d4 (patch) | |
| tree | fbaa5bd98670a3dffeefd8cda48318814bc8433d | |
| parent | 6b70965f398ebcea599225f2215074d434327182 (diff) | |
| download | ffmpeg-1d98811b957db3a4c8a3774e85cf8eb07c03c2d4.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
(cherry picked from commit a8cb1746c5b6307b2e820f965a7da8d907893b38)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -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 c9940da97f..97b21155f0 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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; |