From 28edf31b11c120c996aedb7d7b3d56ebfe6c0110 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 6 Jan 2022 21:05:34 +0100 Subject: [PATCH] ffmpeg: update rpi patch Patch created using revisions f719f86..4dab13b from branch test/4.3.2/rpi_main of https://github.com/jc-kynesim/rpi-ffmpeg --- packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch b/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch index 08648c5741..5c6a0f8777 100644 --- a/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch +++ b/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch @@ -48710,7 +48710,7 @@ index 456281f48c..44956dd19c 100644 + #endif /* AVCODEC_V4L2_M2M_H */ diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c -index 3e17e0fcac..e7055c7a18 100644 +index 3e17e0fcac..3dd462362c 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c @@ -23,6 +23,10 @@ @@ -49117,7 +49117,7 @@ index 3e17e0fcac..e7055c7a18 100644 - if (s->draining) - goto dequeue; + if (s->draining) { -+ if (!s->buf_pkt.size) { ++ if (s->buf_pkt.size) { + av_log(avctx, AV_LOG_WARNING, "Unexpected input whilst draining\n"); + av_packet_unref(&s->buf_pkt); + }