From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5BF5D44431 for ; Wed, 12 Jul 2023 02:07:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C3AA868C5D9; Wed, 12 Jul 2023 05:07:06 +0300 (EEST) Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15D7F68C324 for ; Wed, 12 Jul 2023 05:07:01 +0300 (EEST) Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-3a1ebb79579so4839768b6e.3 for ; Tue, 11 Jul 2023 19:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689127619; x=1691719619; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=ts3Rof5eQ9x5JZTIs+fqskPWu4kplFhrrdpuhTYScQg=; b=MtrprFFi6qD7P2Gb1dy7KtlxumLtSh7SCWJphMxSXu9q3dmFGyPN5YyKpgSnnq0MrL ZCam+tPl+TfYPeSgFVJ5LAzHfEHIEVdny7b/Z3uyQdzp/RsgkCtMVSP5kHAnNk53aNvY 8zWWczMFav+jxWAYyHQyiKTwA+AGUHWE8jsmMOi9U0iJlWP0JqzpLPM8AchLbRYI9SQO tDl7yiVSd2gRhK8Iu+kUyCSIFpQj0B0RROwCTYNI7GNF8SjxfF/9SuXSIwronpGI9kzZ QPpxeZoKYkEZCTyWQxALx+NQbZWQcE/B0qSiXfy3rVfg+uSPhlY8kjse8PWuchR9EbYg 96VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689127619; x=1691719619; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ts3Rof5eQ9x5JZTIs+fqskPWu4kplFhrrdpuhTYScQg=; b=eG8zEADTZ9E5jS0GJYSlGRiaZlOjY50EYDInXw29EltaDYur+NMOXetg+mxxUcfQdm 0aShIT54gGZeswqnEP4aR5yt/ZeS7A/UpECIQQJ/v5yU4JaXjcbsP6cUnbV7AnuEGRON oDQMP82bB5rIwnJP7p166mso9h/AMFAgHN6X26Cvo7ont36MNq6QPcGP2OwiOrGh44bY mLKTNnAdiS6/PkGLC8zo+YaRv+4ChA9TP3UxOO3OZB1D2PADmtF2PUjFIt+4WPkYr5Kk MuLZeZKU2nUlrAymrKX6oMZtXJJh7z6ZZEDpJRic3XB7D7R3nlTbLPsch+YLUrQuY/QA VkKg== X-Gm-Message-State: ABy/qLbKSVjNanoHgerhqRwqEepfEmNFIdEQrjSjTM2DISbjWm6fuZIU faxQ04aGPMacYRxhORmg95HcZkOMTcM= X-Google-Smtp-Source: APBJJlFjdPMuVwBL8ZbxO537i0pR8h8jbTjBwdDtHLZF7U8BRQ5GlZz7jKITraCHLkmuSRjI+GkEXQ== X-Received: by 2002:a05:6808:2181:b0:39e:c660:a5fa with SMTP id be1-20020a056808218100b0039ec660a5famr21591426oib.10.1689127618954; Tue, 11 Jul 2023 19:06:58 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id o16-20020a056808125000b003941c3b9f0dsm1465063oiv.41.2023.07.11.19.06.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 19:06:58 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jul 2023 23:06:43 -0300 Message-ID: <20230712020644.22606-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/decode: don't reject flush packets when buffer_pkt is not empty X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Restores the behavior pre commit a92dbeb9ae. Signed-off-by: James Almer --- 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; -- 2.41.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".