From b7040e67ec18259ca634a0e29d98469b3484a87c Mon Sep 17 00:00:00 2001 From: John Högberg Date: Fri, 24 Jul 2015 15:30:38 +0200 Subject: h264: fix AVDISCARD_NONKEY for some interlaced content When skip_frame is set to _NONKEY the decoder skips everything except intra slices, which breaks frames that consist of an intra field together with any other field type; half the frame becomes garbage. This patch fixes the issue by letting non-intra slices through if they're part of a keyframe. Signed-off-by: Anton Khirnov --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/h264.c') diff --git a/libavcodec/h264.c b/libavcodec/h264.c index eb4edb9f9e..7c2b307787 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1507,7 +1507,7 @@ again: (avctx->skip_frame < AVDISCARD_BIDIR || sl->slice_type_nos != AV_PICTURE_TYPE_B) && (avctx->skip_frame < AVDISCARD_NONKEY || - sl->slice_type_nos == AV_PICTURE_TYPE_I) && + h->cur_pic_ptr->f->key_frame) && avctx->skip_frame < AVDISCARD_ALL) { if (avctx->hwaccel) { ret = avctx->hwaccel->decode_slice(avctx, -- cgit v1.2.3