From patchwork Mon Sep 6 20:29:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30054 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4064408iov; Mon, 6 Sep 2021 13:30:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRUid02K54OKzcTSeh+ZtdkwEN2k1yCU76vy3uK3ZUvh80G2+7no7N09/9vdVzXdgEo53K X-Received: by 2002:a05:6402:1d05:: with SMTP id dg5mr14906766edb.375.1630960230033; Mon, 06 Sep 2021 13:30:30 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds15si9745914ejc.506.2021.09.06.13.30.29; Mon, 06 Sep 2021 13:30:30 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=LjdxzsSE; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B16168A753; Mon, 6 Sep 2021 23:30:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073014.outbound.protection.outlook.com [40.92.73.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E61D68A755 for ; Mon, 6 Sep 2021 23:30:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PxTO8nolL8TWyQQOhoZSn7Ev5ldhgPm2BVcKwMLHf+x+jPeTsRT1vhDqI9IljBclQaaaSdaAcZpmSQqfJ8Fp5bOLPDOJ7BZ7qpAWDKojGPugbSOAWtxeU6hZ6bAY4TVmO5HpiA/4l6hpMtnQU6rw8VMiG4wfZaWGo1dSZ8Ha2g5EuM5lWcB95ZDN378X5V/LUdTMG2nZcN/Rlm1pDiUmP5pAWBlLIpRY7QuraQW7gsG8Pf0GD6Q+rKZRMWXrTa+SsfX5gX1XQa5Dj7EUKWNU4ygbIsOuIqraCI55YBSNDPQVP6v8ODAI4ZU5XKYeXyhQp3T9EusdYqco03fotmVKRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q4UdXqeCHH1PCtspkKL0loU8+P+n5Dtha5kP98Y+mkY=; b=KKCDHtkrqZPnpLfMYG5o+1njvaNwgta3F4SSoSR9D20KM7E8XQVJgSdN5eO/G2c+KQxAfwqtDHTPYg1o0bWz0UFo+SUUfyIBInIipAQyMdj3vVO1jfFRvcmW2O0TXXzhG+HOWKiDhCcDibUDg8rul59ggG0IdNmzAFROmBmfyh40eUemSXa2YxOwafIZuU8q/pSF+oQ5vaQYvOeYwu5tktaoLdn/4AiC5zDBoqrSKqkAZ/cNjZdPK5RjhEAjNaal+CwO1HrrB9L/r+HCoZSZ4cOPzdv4kZGZEUnTbeXfHZqovDlK0qv2oXgyFAEYYVbAdkINyJ4y75vUzlUsVLTENQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q4UdXqeCHH1PCtspkKL0loU8+P+n5Dtha5kP98Y+mkY=; b=LjdxzsSEFkVoGBUQ49Eo1zu0KV0TOL9s0mSHTMvFCZ/ugRHfHW1Nt12JWuEVJ9+xhVnIN+nbLZ4Y8k3pTUw6xPcsPBexrg/lFtXuFHUyzRKMVFrl6rE8fPs5ooDdMT5mizuDr9vgTv8e6MfiMiZ2hdeCMWIaerYDi27tmuqtyd6eJSzXHDAV98t9aXqX/07VH+G+dpX4p0Zw1qqKmTzHP66JMx15/Y3jYvI78McbrOr9um4XbvpZojxRoishqyZygXZnOkzbKQz9FTBpEJ7nsCfOIdkeVyE28UruXLRGbVALh7kIvX5MAI6nUxHc2KePJDbBF3TFgO1Sg02v+NY2jQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4950.eurprd03.prod.outlook.com (2603:10a6:20b:87::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.24; Mon, 6 Sep 2021 20:30:00 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 20:30:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 22:29:42 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [bEAB3j/YVnDdnCLCm4LS3sen5B2DFsJ0] X-ClientProxiedBy: PR3P195CA0014.EURP195.PROD.OUTLOOK.COM (2603:10a6:102:b6::19) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906202942.306993-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P195CA0014.EURP195.PROD.OUTLOOK.COM (2603:10a6:102:b6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17 via Frontend Transport; Mon, 6 Sep 2021 20:30:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea72ef3a-073c-4e57-1711-08d97175198f X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKb3QWS1fMq2sXm1TdI02LjAbYmWAKCMaE31lTGc/OaIi4j107briBiia+ZeKpaVgKmnQT7CaQ5ipEI2FDW9ATVKksaVYXBi7osMGbhdee/s0L52yaYuutEN0EB8MmdS7uDUwwLMWKiLpF8qxd2Ufr+E+UJK33V0X0KrECQEiTxmzfNjJSxEkRjoRF6YMm6NE7AB0njFDpeeRUGzny9R+Pjb/mPFjFtXQCXRqd10Q52MyssApp6z7Vo5HwG1nvFQepd28tUE9L9ZGQRjPrI7HfHM+mu/Zwj+D9Bib2RuLXFYRc0zt8B51cayJg1npR7++SMkri1HtpU1nr6fuGJA8ZqRUHGFzyzhKIpWMNiJ15KNgk1p//py00bPzN2sD6joFEQZ0T0MOlMWLF91Ayn26KpQaVVYscoG4A02iIk3sfklGuDolJ1K/zmTqWwInUtloCmcbZLvp69ew6aueIpbf2MNEDwYeCj0Hj7l/+X6bzF+8leTXyECxpsRCJWtK0Tl4vXp3hoHhfp4/zRgf3+aNalizHOAK8FhoS9x6nt1hpbkkixn/zpKXaLj/NFLbjZ62l0B9dML+7IHv4LCiHUTN+InJ5nsqzMSRlBPyKmdbMhyc7i5/w788J6ltFNiX6TVHffnzfUX7VlQY70zwcdFmlR4U0/EpAu1cPdo4AbKCFw7IMocAMTJAaix10cQtD3/ANgpSVV4Z2iOQ== X-MS-TrafficTypeDiagnostic: AM6PR03MB4950: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HC7k2Dx6qRrcYlSOV7q1AQrx3s0T34rOuBzdPD8p4Vr4nKEZNiHppy5aPgLXF/+iDFBreazh5tLrxbqwAgypr69pIqnE2dpiVz3/ffNcC/ufKWPS777Nd99mnUhgL1M8k3VL1hgPprYgqTZDRTK7C/PzzcPNLHT9jmym2zfzdMU8jED6doOPydBkQ7XB+AL9KaBWQUSSGOFEnRhbAun4TM4Y/qN1hK/JVWlr1X7u5oZUFDaaEIng2Du0FeV3RdW228mjKQVGf71xGYYi1scFn54d4z3JEusEiG41PM5L2FM31G/M6sw3Kt1NW3n9bbpTC+dHRFxCHGIz/gqaY9oGDOMbBKOR9ayRQbsA96lfVrPt3H7/TtwhG2161oZVPVudSLfUBKga6haxxORcC025gQG3w1OBuyPvNkEfRmJP2Eaj/Khlwt42jeP9PNpC7lmG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1X+wJSzBbopp1pthQeP13c9N/1KqhDfsFeRgBj4/8D2OiI13u/2o94Je8o9leVlof4Ey1ASb8sMBrIGxSP1nlYUt/cHDm0HYh5I40prJswzG90VovbrBCiCfUCPGot94DxSo10GIskTkMm4qdoWFAg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea72ef3a-073c-4e57-1711-08d97175198f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 20:30:00.5806 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4950 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/decode: Honour avcodec_send_packet() documentation 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iveqwi0X2/OZ The documentation of avcodec_send_packet() states that NULL packets and packets with data == NULL and size == 0 signal EOS. Yet avcodec_send_packet() actually used the BSF-definition of EOS: A packet with no data and no side-data is EOS. This commit fixes this. Signed-off-by: Andreas Rheinhardt --- A different solution to this mess is to adapt the documentation. Given the recent extensions to AVPacket I have come to regret that we allow to signal flushing by anything but a NULL packet. libavcodec/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 4def801516..6a4b559c8d 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -587,7 +587,7 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke if (avpkt && !avpkt->size && avpkt->data) return AVERROR(EINVAL); - if (avpkt && (avpkt->data || avpkt->side_data_elems)) { + if (avpkt && (avpkt->data || avpkt->size)) { ret = av_packet_ref(avci->buffer_pkt, avpkt); if (ret < 0) return ret;