generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-07 20:56:18 +02:00
parent 8a4a84a70a
commit 9140d37af2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264.c
View File

@ -1622,7 +1622,7 @@ again:
hx->nal_ref_idc) && hx->nal_ref_idc) &&
(avctx->skip_frame < AVDISCARD_BIDIR || (avctx->skip_frame < AVDISCARD_BIDIR ||
hx->slice_type_nos != AV_PICTURE_TYPE_B) && 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) && hx->slice_type_nos == AV_PICTURE_TYPE_I) &&
avctx->skip_frame < AVDISCARD_ALL) { avctx->skip_frame < AVDISCARD_ALL) {
if (avctx->hwaccel) { if (avctx->hwaccel) {
@ -1683,7 +1683,7 @@ again:
(avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc) && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc) &&
(avctx->skip_frame < AVDISCARD_BIDIR || (avctx->skip_frame < AVDISCARD_BIDIR ||
hx->slice_type_nos != AV_PICTURE_TYPE_B) && 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) && hx->slice_type_nos == AV_PICTURE_TYPE_I) &&
avctx->skip_frame < AVDISCARD_ALL) avctx->skip_frame < AVDISCARD_ALL)
context_count++; context_count++;

2
libavcodec/h264_slice.c
View File

@ -1856,7 +1856,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0)
} }
if (h->avctx->skip_loop_filter >= AVDISCARD_ALL || 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->slice_type_nos != AV_PICTURE_TYPE_I) ||
(h->avctx->skip_loop_filter >= AVDISCARD_BIDIR && (h->avctx->skip_loop_filter >= AVDISCARD_BIDIR &&
h->slice_type_nos == AV_PICTURE_TYPE_B) || h->slice_type_nos == AV_PICTURE_TYPE_B) ||