aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-07 20:56:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-16 13:18:55 +0200
commit9025072e6c25ffd4507f0268b53743f9c4d52cd6 (patch)
tree0bb9d280c17db072e612d0e6b71bd9c0e210d857
parent9140d37af2fa17c12f6383e94328ec7072490121 (diff)
downloadffmpeg-9025072e6c25ffd4507f0268b53743f9c4d52cd6.tar.gz
avcodec/h264_slice: support skipping loop filtering for non key frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264_slice.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index deb672034d..51120531df 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1856,6 +1856,8 @@ 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->nal_unit_type != NAL_IDR_SLICE) ||
(h->avctx->skip_loop_filter >= AVDISCARD_NONINTRA &&
h->slice_type_nos != AV_PICTURE_TYPE_I) ||
(h->avctx->skip_loop_filter >= AVDISCARD_BIDIR &&