[FFmpeg-cvslog] avcodec/decode: don't reject flush packets when buffer_pkt is not empty

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Jul 11 23:04:10 2023 -0300| [e6954fd087d4b36cae6834e2c6b423db604f569b] | committer: James Almer

avcodec/decode: don't reject flush packets when buffer_pkt is not empty

Restores the behavior before commit a92dbeb9ae.

Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavcodec/decode.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index a47abeca06..239ad70b41 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -666,10 +666,9 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke
     if (avpkt && !avpkt->size && avpkt->data)
         return AVERROR(EINVAL);
 
-    if (!AVPACKET_IS_EMPTY(avci->buffer_pkt))
-        return AVERROR(EAGAIN);
-
     if (avpkt && (avpkt->data || avpkt->side_data_elems)) {
+        if (!AVPACKET_IS_EMPTY(avci->buffer_pkt))
+            return AVERROR(EAGAIN);
         ret = av_packet_ref(avci->buffer_pkt, avpkt);
         if (ret < 0)
             return ret;