har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

h264: fix AVDISCARD_NONKEY for some interlaced content

Browse Source 
When skip_frame is set to _NONKEY the decoder skips everything except intra
slices, which breaks frames that consist of an intra field together with any
other field type; half the frame becomes garbage. This patch fixes the issue by
letting non-intra slices through if they're part of a keyframe.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
John Högberg 2015-07-24 15:30:38 +02:00 committed by Anton Khirnov
parent b5c1c16247
commit b7040e67ec
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -1507,7 +1507,7 @@ again:
(avctx->skip_frame < AVDISCARD_BIDIR || (avctx->skip_frame < AVDISCARD_BIDIR ||
sl->slice_type_nos != AV_PICTURE_TYPE_B) && sl->slice_type_nos != AV_PICTURE_TYPE_B) &&
(avctx->skip_frame < AVDISCARD_NONKEY || (avctx->skip_frame < AVDISCARD_NONKEY ||
sl->slice_type_nos == AV_PICTURE_TYPE_I) && h->cur_pic_ptr->f->key_frame) &&
avctx->skip_frame < AVDISCARD_ALL) { avctx->skip_frame < AVDISCARD_ALL) {
if (avctx->hwaccel) { if (avctx->hwaccel) {
ret = avctx->hwaccel->decode_slice(avctx, ret = avctx->hwaccel->decode_slice(avctx,