From 9140d37af2fa17c12f6383e94328ec7072490121 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 7 Jun 2014 20:56:18 +0200 Subject: [PATCH] avcodec/h264: use the correct level for droping non intra frames Signed-off-by: Michael Niedermayer --- libavcodec/h264.c | 4 ++-- libavcodec/h264_slice.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c46c372466..49e512de87 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1622,7 +1622,7 @@ again: hx->nal_ref_idc) && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos != AV_PICTURE_TYPE_B) && - (avctx->skip_frame < AVDISCARD_NONKEY || + (avctx->skip_frame < AVDISCARD_NONINTRA || hx->slice_type_nos == AV_PICTURE_TYPE_I) && avctx->skip_frame < AVDISCARD_ALL) { if (avctx->hwaccel) { @@ -1683,7 +1683,7 @@ again: (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc) && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos != AV_PICTURE_TYPE_B) && - (avctx->skip_frame < AVDISCARD_NONKEY || + (avctx->skip_frame < AVDISCARD_NONINTRA || hx->slice_type_nos == AV_PICTURE_TYPE_I) && avctx->skip_frame < AVDISCARD_ALL) context_count++; diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 5f67b54ae3..deb672034d 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1856,7 +1856,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0) } if (h->avctx->skip_loop_filter >= AVDISCARD_ALL || - (h->avctx->skip_loop_filter >= AVDISCARD_NONKEY && + (h->avctx->skip_loop_filter >= AVDISCARD_NONINTRA && h->slice_type_nos != AV_PICTURE_TYPE_I) || (h->avctx->skip_loop_filter >= AVDISCARD_BIDIR && h->slice_type_nos == AV_PICTURE_TYPE_B) ||