git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9140d37
)
avcodec/h264_slice: support skipping loop filtering for non key frames
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 7 Jun 2014 18:56:19 +0000
(20:56 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Jun 2014 11:18:55 +0000
(13:18 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_slice.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264_slice.c
b/libavcodec/h264_slice.c
index
deb6720
..
5112053
100644
(file)
--- 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 &&