Skip to content

F
ffmpeg.wasm-core
Commit 9140d37a authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avcodec/h264: use the correct level for droping non intra frames 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 8a4a84a7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
libavcodec/h264.c
View file @ 9140d37a
......@@ -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++;
......
libavcodec/h264_slice.c
View file @ 9140d37a
......@@ -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) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment