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
This commit is contained in:
Matthias Reichl 2022-01-06 21:05:34 +01:00
parent 3e29f9bc64
commit 28edf31b11

View File

@ -48710,7 +48710,7 @@ index 456281f48c..44956dd19c 100644
+ +
#endif /* AVCODEC_V4L2_M2M_H */ #endif /* AVCODEC_V4L2_M2M_H */
diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c 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 --- a/libavcodec/v4l2_m2m_dec.c
+++ b/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c
@@ -23,6 +23,10 @@ @@ -23,6 +23,10 @@
@ -49117,7 +49117,7 @@ index 3e17e0fcac..e7055c7a18 100644
- if (s->draining) - if (s->draining)
- goto dequeue; - goto dequeue;
+ if (s->draining) { + 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_log(avctx, AV_LOG_WARNING, "Unexpected input whilst draining\n");
+ av_packet_unref(&s->buf_pkt); + av_packet_unref(&s->buf_pkt);
+ } + }