From patchwork Fri Dec 30 12:38:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39815 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5526316pzb; Fri, 30 Dec 2022 04:39:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXv6ULg7RRk4LLJLGMhzyRrLrwEYIUhla8W0Q/l9zpElD+AJkMUNWjFqLnAtV1OOUIHJwgmi X-Received: by 2002:a05:6402:3784:b0:46b:eadf:8d34 with SMTP id et4-20020a056402378400b0046beadf8d34mr25628692edb.7.1672403942261; Fri, 30 Dec 2022 04:39:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672403942; cv=none; d=google.com; s=arc-20160816; b=W/WX6aCzC022UMLX8e6OkLwxnNx7lmV2D42SvORjlFnjXtmM8gkb+Sbqwo6jarDc8c +Tk+FHe6E50j9Q10gY5F4xG16i8pduQXFMJe0PQ3aswcYZ+NaqIu6uUuPxPqXg1+sQPy 3F8N3Ar1DH5l0raND+6Mc7uYcm6CkjUsps/jJvcpzBEm+NKeoUz/yt5h1vsqLIpmTNcv ie1JmnALVHriHPkntljrkPtDvPrrhu1dpmNgTORAgeOrh3PR138Ht2GCx8kOhvaN11xn NcQmHSRCQEYzjQ+0+LhtVCnRGfI6tGMNksi+JRVv6cv77XkRbC4b9d539DSFf8mdjeA5 kPnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=U814Cu9OU3orn/El1zZ0m2Dnia6nM5E+htLSpaNXefM=; b=dC8lVwmS8NoM4zdAdifOFt0gQtfDh9KcQZ3X2cZMALISEfR4CMTM6KLcmuiwDqUrCQ V0FhoKdJ4SVRXF4KxZb4PcB8SSuEbneDMCEIpiQqCNpVFsRVULZhptT9AcYbszEXZMOl o57HLVLomtvE1Iw4pceTw9j7W5rWPgfpn/mbx5BAYYCirj00Ktj5QnHdAUSeCowyFbnE xit5Z7otnzIfq7urDLF6agIHVSSUCVR7CI0bsS+bitcYshe3VJroRcsVacAL2TqJC1SM dwE3oyM8MA2aRrFizrqVJ0NxJxlUrkuhUdWouizH67S80+AhhjBv4rJQSoXeXSSun6H5 411A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=hc3b20jg; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b9-20020a056402350900b0047fc0a1dfefsi18354809edd.385.2022.12.30.04.39.00; Fri, 30 Dec 2022 04:39:02 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=hc3b20jg; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E41168BA2D; Fri, 30 Dec 2022 14:38:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E61EE68A846 for ; Fri, 30 Dec 2022 14:38:50 +0200 (EET) Received: by mail-ot1-f53.google.com with SMTP id m6-20020a9d7e86000000b0066ec505ae93so13012726otp.9 for ; Fri, 30 Dec 2022 04:38:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=W//POP34G6y+aJYAKjIDAfs2LZIW41c+Uiy8psuDZBE=; b=hc3b20jgYzks0RtG5eJKgYM8s5twtjwYvhd5DmldNilgthSs2KCByuqs36ffHiD9xs TL4tYEVbhB5Q3mIYE2NnAWA16oo139eBniJ7uTBxfaaY8eJK3M9zfLdWO2iMp+1jQ1D1 7dcU392tJuDBLWVQAqrVwYqYQ5cWtHK/oF+mrg/0GQOCYG7TTEDoDuUN3c+KmbmgQ7ih txlaMz3Lg+mwgQwusV+EILR1IrssUCR+E70wKTjgK/f5aAhYP5m6+YyKcV7v/auAHv5/ Vpq9kkmC+7M7GIp0bOWv8KeKFYs/M5GOW4EEwuojCKUruSfPYqrnPYnEzJFuqXAzbIXb y7FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=W//POP34G6y+aJYAKjIDAfs2LZIW41c+Uiy8psuDZBE=; b=HL5Lu6n4ZZ1ROv6teFFwFTu9H79KAYtadAK3qTEQuwzYvCEoJ79KL+A36lGzq1QG8q R/XFoejpZNi1xmhYkawGRelTDMA6JuJa8DrU+EdUbRDaeEyTZoAVGSbdCMvOm2TtnddA eX5rUl9WPRCDXTSKpHf2GVE3BZQFLRvfMYCTBWt+3qMfk760aoCejBUgZSDgx9PyxBHA mwxhjq7I4SpP+u8xP5tKvdR7EqkLfEHmlDT7KEapaPFXZZwaoDqtz4DGwFoeBqA3zFBV mG78400h86zBR3n+NW3xIeL/FaPLwx9JDcGRjQt33IjT/rV0JZMlKl9CIXO+C0jQJB8l TUAg== X-Gm-Message-State: AFqh2kqT1h6ecG4OuCVupZjBWRr6zxt2yZBPaictdnTNClIPqiE/VH3I dvIgqV/PdUuSUg8j9h9We9P2MIstipQ= X-Received: by 2002:a9d:6d90:0:b0:670:5549:9b63 with SMTP id x16-20020a9d6d90000000b0067055499b63mr18986906otp.6.1672403928451; Fri, 30 Dec 2022 04:38:48 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id l10-20020a056830334a00b0066eb4e9242esm10183526ott.67.2022.12.30.04.38.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Dec 2022 04:38:48 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Dec 2022 09:38:34 -0300 Message-Id: <20221230123834.955-1-jamrial@gmail.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/oggenc: don't flush twice when the last packet is side data only 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XiBgKhe35/VJ Commit 18f24527eb accidentally made side data only packets be handled like a flush request. Fix this regression by effectively ignoring them as was the original intention. Signed-off-by: James Almer --- libavformat/oggenc.c | 4 ++-- tests/ref/lavf/ogg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 5003314adb..458b2a9bdc 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -687,8 +687,8 @@ static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt) { int i; - if (pkt && pkt->size) - return ogg_write_packet_internal(s, pkt); + if (pkt) + return pkt->size ? ogg_write_packet_internal(s, pkt) : 0; for (i = 0; i < s->nb_streams; i++) { OGGStreamContext *oggstream = s->streams[i]->priv_data; diff --git a/tests/ref/lavf/ogg b/tests/ref/lavf/ogg index 0796ff568a..3ac10e6f7c 100644 --- a/tests/ref/lavf/ogg +++ b/tests/ref/lavf/ogg @@ -1,3 +1,3 @@ -507a906a705d16f3a3b0c4114c738110 *tests/data/lavf/lavf.ogg +81b9366cacb23644c2803585dced9996 *tests/data/lavf/lavf.ogg 13516 tests/data/lavf/lavf.ogg tests/data/lavf/lavf.ogg CRC=0x3a1da17e