[FFmpeg-cvslog] h264: fix AVDISCARD_NONKEY for some interlaced content

[John Högberg]

ffmpeg | branch: master | John Högberg <john.hogberg at ericsson.com> | Fri Jul 24 15:30:38 2015 +0200| [b7040e67ec18259ca634a0e29d98469b3484a87c] | committer: Anton Khirnov

h264: fix AVDISCARD_NONKEY for some interlaced content

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 at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7040e67ec18259ca634a0e29d98469b3484a87c
---

 libavcodec/h264.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index eb4edb9..7c2b307 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1507,7 +1507,7 @@ again:
                     (avctx->skip_frame < AVDISCARD_BIDIR  ||
                      sl->slice_type_nos != AV_PICTURE_TYPE_B) &&
                     (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) {
                     if (avctx->hwaccel) {
                         ret = avctx->hwaccel->decode_slice(avctx,