From patchwork Sun Apr 11 02:12:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26856 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 28AD344B85A for ; Sun, 11 Apr 2021 05:13:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5980687F19; Sun, 11 Apr 2021 05:13:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA20968020A for ; Sun, 11 Apr 2021 05:12:55 +0300 (EEST) Received: by mail-qk1-f174.google.com with SMTP id g15so9855958qkl.4 for ; Sat, 10 Apr 2021 19:12:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=RG3pg8I7yG3oXBrxcIgINkdAeYQLV+WvUpca/LpM6Sw=; b=n3smTRrbW+oskJNND0g9NEBUc535/BUdMZZpzNf8THDjclwfmQH6XrVmTwpB8upzWG r9QwVImtSkSiJfXHmKOjY6y6tTGSSP5h4GwIzplZRCuYRPgoe17TWqLW78jcf/pAd6k3 Sm2c3cTn3mzY5/DicIOc8rDqXTeoDply3jl94wqcF0ajPu2dBRsQRNY1ecmrLhvI63P1 fgswr84Kt5UYl4qHaCWb+9szUZXRFzKQZFLcfTrIPaOEKCutYsu24NBOGIXid1wKopbk eXTFVbfNqpKGpDr9/030W17UjjM7hpJbw/pr2sjp5ZDR0c71DVjuuUqJxDMPALb8ONXj JUzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=RG3pg8I7yG3oXBrxcIgINkdAeYQLV+WvUpca/LpM6Sw=; b=kBwY8tnTSgWSPTw9SwWhlKPvR9W2x8XDEi6g2B8O4o8EOZPNIq18UBP62Z2mAJ3bEu YmiIjB5Pij3HvPQ/Nw9a3m+3SPz2tGGvTpT8NTBZDWgag3CJRtfMrzdqAZF+NgUJHU01 0v/NTP+bn28GYjOHqfB4wFtAmRn44H1+7RhXq18R5I75lSyP7Le3PiXxFgsjY/9ifEe1 7jgvBxYJV2hm1KGKYNYNItBN6hQxkAtoKDZ6SPRUVZidCbDyd9OOlaVEm/7M5NoULKfh Ygya0gyIq22vz97PWpRyAGutzXDrTX4WPx+D0PixSnPasXfIrGVPtxyVMdd/1RJbIJdu ZW+w== X-Gm-Message-State: AOAM530dw8sKrtmNeDeJknIyLc0RwAG2FoqFjej8u5KNXf1XmQJNs2rO NnUTivi+gZzAEbpFV5vule2djWlw1ZI= X-Google-Smtp-Source: ABdhPJwGikl8FPo50OYAmJJ2b/RRcYc9yHRHnQp56VEUVcHtZISS7SVDgKJB8KRksCd7T6aZ7V+OTQ== X-Received: by 2002:a37:c08:: with SMTP id 8mr20991752qkm.423.1618107174149; Sat, 10 Apr 2021 19:12:54 -0700 (PDT) Received: from localhost.localdomain ([191.83.208.158]) by smtp.gmail.com with ESMTPSA id d10sm5083749qko.70.2021.04.10.19.12.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Apr 2021 19:12:53 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Apr 2021 23:12:36 -0300 Message-Id: <20210411021238.29014-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/libwebpenc_animencoder: stop propagating bogus empty packets X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Packets must have at least one of data or side_data. If none are available, then got_packet must not be signaled. The generic encode code already discarded these empty packets, but it's better just not propagating them at all. Signed-off-by: James Almer --- This patchset supersedes "avcodec/libwebpenc_animencoder: Don't return pkt without data/side-data" and "avformat/webpenc: Don't treat zero-sized packets as invalid". libavcodec/libwebpenc_animencoder.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/libwebpenc_animencoder.c b/libavcodec/libwebpenc_animencoder.c index 7f35a0b939..633af2e925 100644 --- a/libavcodec/libwebpenc_animencoder.c +++ b/libavcodec/libwebpenc_animencoder.c @@ -102,10 +102,9 @@ static int libwebp_anim_encode_frame(AVCodecContext *avctx, AVPacket *pkt, goto end; } - pkt->pts = pkt->dts = frame->pts; s->prev_frame_pts = frame->pts; // Save for next frame. ret = 0; - *got_packet = 1; + *got_packet = 0; end: WebPPictureFree(pic);