From patchwork Fri Sep 3 23:10:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29987 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1726931iov; Fri, 3 Sep 2021 16:11:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxieRPm2YKHcRyMF7nIgP+UiIF+EPwCwvS8RqoaKQbLNzqS7PMNwsbvw/RegZWbzMdbKqxK X-Received: by 2002:a17:906:74d:: with SMTP id z13mr1306646ejb.127.1630710669939; Fri, 03 Sep 2021 16:11:09 -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 x9si149931eje.318.2021.09.03.16.11.05; Fri, 03 Sep 2021 16:11:09 -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=uVta6Jpb; 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 95F98680523; Sat, 4 Sep 2021 02:11:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067016.outbound.protection.outlook.com [40.92.67.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2EC8680523 for ; Sat, 4 Sep 2021 02:10:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IUy+HiU0v0mC1HDdPRiIe5sPaRDp7vp87eHfT2YbcRW+Q3eZnnaF68GsCeMRiTa9FHQXwcGMem4FobtJ9TWwQ2Un+1nn2reEzVfYYUpNam4Yry64ZCuSwXXktin0YmdcMJ9ifGNqASbrZJ3S27Vm4xgAdR5+s1z4AgKI0lRqFewzhQJRJ1bRni5kW/GSAE5wq3F9dUkmDSvdotZJJmhvS8w6UCHG+WZqP+nO/CAf9cLEIPJv0hoyAU3L46Pl5A7xH9jZK7e1+pvIEwBwtwIVfRikvle2Cw1bONnlMf+S1skrsvtWV8pzcsK8RFRdvJPSVkEcMekJO59q8yWJdv/q8g== 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; bh=0ZL5n/dyEz8EMEthcxsDJE+2KJ2TnOfhEt4pjW0oTBA=; b=W4LvMxY5HDce5nfdTKZJkqDN1MDp614xSgTA31QP/qnNOonBsXC3fBez4fNom1pCeD6zgjfamUJac00vZlXjPH3e+smqaVfv9MIX8ySQpjufc1TPb22KVHZYUCjzWodlPvHGEY3adU761cfjSwsK8lVH1kSg4psuhXLX3eftC8Gedi0csdW0bFNLT7wKyDB+bfVpcTHQBx5fgT4gSWaMoA9LnkkrG7Ef6InOh1rKFOouzrNvoSGvqaD7P/VSX4QSxeR7OwOsxKxAasqMi+pnCMlNwiLNn7WEcT9OlBSwH4PM+HL69Z/rk+swmPFazwbRwp2kNO1zXm9XPXQLMrKqCA== 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=0ZL5n/dyEz8EMEthcxsDJE+2KJ2TnOfhEt4pjW0oTBA=; b=uVta6JpbCFWn10jTGQSliR7616XU9qkzXIHh05s1IYiEA64FMz+XgYIcYIx/xWX6GymKP4OMEncupDFeHrMz5Ni4irU6KKoYFvNk25lmz765dx4x50/832iGsMHfw6y5QoUtZwqZPjAdcFPaNdL/2iTGsNHSsWNLRoBz87D+iN2RGclAmeuT/JfnzEueBXgDRU43Qlr8m8v3mMP3ZXraJV0q7mAd4xrYjg9YAIh1MSJFw+ZrNFwngiRigN+VfooMv83eYolyiVDHJI0GPmmYphl+NMGh3XdZ0sAKbwCF+a7Wa3MvDCH2rnseO/eHOGqx3JOhEgu37BbZR1aEqhiT0A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3009.eurprd03.prod.outlook.com (2603:10a6:206:18::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17; Fri, 3 Sep 2021 23:10:53 +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.022; Fri, 3 Sep 2021 23:10:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Sep 2021 01:10:32 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [tJRUkJHqt6nTsg3GXEiUAZLMpr+gNBrW] X-ClientProxiedBy: AM9P195CA0023.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:21f::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210903231042.3346323-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM9P195CA0023.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:21f::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Fri, 3 Sep 2021 23:10:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8d675b33-6205-43cf-1a3c-08d96f3013b7 X-MS-Exchange-SLBlob-MailProps: EpEO96k6WomgUcfN1U05Hvh7Gqub3TXLhyGduNKFysyk4MKZjmHIogeckvUbv6v4iZxr/CD0/nMA6/WZCfoI4/nr68GLQCKNzDCzfsvx/X7tqS4QNrNMPrerKl87E/alYyksxeIlCpoZ7y4drMD7zxy/9HGilODYxRO860pCoD1tMmF6QWEmNUpYKopzzbxtZKl+rH2rXdjIwylgOxLBvYI2+xEnK7/95mq4ZgYF0y9+Ne4cApuuy+x5AAZrJAwJr1aJwtuRV06dAbj6sZ3iFodpyAMISTI3VndkoeYkxgC7wPOPCOwBvDCqmkYcCCkA4bThYo3oVWiyR1NGNjCJkWApR4YHIzVPnPCjYkcUFaMgsnUCNyKr5IhWyGiz2o0zpWLfkBtJ4raZWF/vCPUgrtbuWOHgi42R5Iw7QlvXXUW7SpQ4bf6B1ztJ2ZC4O6jZ3gJbr/FCayhUhW9CFKKUAElesUsNJmBzgHXG3z6bf6MnUbovTVA8/+KItBk0DlFbZh2+D7rd3JCNKaQ2iHor40vLszh9zY81uz/pBhgy4RBTWmqW33f9iGfneZgitm1cWOrQ2QvQdVg+xum7hVmqz/m3idjjXup9y2CcA5Ll2mS4XGzLpyYbK4Ag/EMb69O/AHvrbGLOywPKPsPG277G84cv60VQ8vNSQ5UoTQYc4iKeqz7hCmnMt0r31t5h9ssaeCEJz+3/3Zbjt7SH7805U541+w4aBQvD5uCedZrR7TbMDzJEyZ7oRT/3W6kNcosrYQ6sSug1A+Y= X-MS-TrafficTypeDiagnostic: AM5PR03MB3009: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wpiMX4O1bPTKa3gou/gRRa7jamAmJuVsKPG9mpoNLvPUEu1BlAMxEen40nG8AnE9a0wXFObrnZd0PbaXOVHsc4ZM7ri/8nxq7UsXHFwSYBhYncJu1ULEEIdq3RCeAJ79tOKffwChYMwJJVBbXmc9ntMfWGGTJZYZ7d5Q0+KdU/I+aLDnzJnKQfm1JN3/0pZdzFnFodt2eFdyhYuuLplmrWTJS+iviYz46WjrhMB0sy6w/Th4QDHv20B0CA/qIyrLrVj1GGj2cfbxDk0yG2olF8jkmH/H/r6RsccEvNqqccOjGwaENQ7iDL2D4/SaeahzLArPQjspB+NbNIpCfl2YbUWRh0ZMItJzKnFxn3fi9hp6WXm/LAKnj8v+zu3eS5x/ylY2k2ogb4AvfIsItkq/QPG7rj6XTClBXkHXw9d1hiulWoXA3lmu7fUwX7lzwfpJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hG34UeN4CZHiP8onWsMFLRkbzWPAOHpe64WFL0oeh1WyPr4CPqYiHxfUXoQ1McTTa0fz47ynYpCzIUFfl/ro9vavfBHzLJ8rpREEt+m7KzNP3hVoe9KVbg9keneWMYJ+uTTdEiMGyGUmkFQozims2g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d675b33-6205-43cf-1a3c-08d96f3013b7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2021 23:10:53.4922 (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: AM5PR03MB3009 Subject: [FFmpeg-devel] [PATCH 01/11] avformat/mux: Sanitize packets without data and side-data 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: 01jpCimf8oKh The BSF API treats such packets as signalling EOF and therefore such a packet might corrupt the BSF state. In such a case, the guarantee that av_interleaved_write_frame() always frees the packet is not upheld. Signed-off-by: Andreas Rheinhardt --- My first attempt was to disallow such packets, but the movenc test explicitly used them (see signal_init_ts()), so there seems to be a use for them. libavformat/mux.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/mux.c b/libavformat/mux.c index 6ba1306f2b..dbcd3835c2 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -784,6 +784,13 @@ static int prepare_input_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt) if (st->internal->is_intra_only) pkt->flags |= AV_PKT_FLAG_KEY; + if (!pkt->data && !pkt->side_data_elems) { + /* Such empty packets signal EOS for the BSF API; so sanitize + * the packet by allocating data of size 0 (+ padding). */ + av_buffer_unref(&pkt->buf); + return av_packet_make_refcounted(pkt); + } + return 0; } From patchwork Fri Sep 3 23:18:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29995 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1731356iov; Fri, 3 Sep 2021 16:18:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzn2yuTvh4DGFZ6c/k+VIRGIYuFBi39eiduxpgZwevo4TJD9Z4F+3gDj526+p3cO1x1H8Xw X-Received: by 2002:a17:906:d045:: with SMTP id bo5mr1312891ejb.461.1630711112545; Fri, 03 Sep 2021 16:18:32 -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 ec52si797877edb.515.2021.09.03.16.18.32; Fri, 03 Sep 2021 16:18:32 -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=UtOWEaQX; 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 64B2D6804B8; Sat, 4 Sep 2021 02:18:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2036.outbound.protection.outlook.com [40.92.90.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB45B6804B8 for ; Sat, 4 Sep 2021 02:18:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zsp8jvRMXESyVKc9r+orU2+zmwz9K9/L9veQydxUeb5NWZsOc1MJ91i0RNw3EiP2GkR0UYDT89s6ZkhI8rgrnYVJotoPa3+2xrDE4xx9qZZl5QaIqpzI5/CVUpchguHulgP+YUpxyg5xcgK7sLFrjqLQOIsd+UjEIvza1eDjc09k2LbKb8l2xJvm9oY4Dy7PuKAuxOHl4HHWpFYzcTLrzXYRJbKxvZzXi7AcYshSdTGvDgCDmaPYDOKwUsipapy4RLnHPyfMOlVC+g/hczNmgDZZIsTVA9+bNBm1VfmaplHDon4Nj9LHjS5Q2kZxvyQbX/ZX8tyWcmpl9PCB+V7DPg== 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=PTZ5MSpOK0HsUHp6TzgEdf/FqAcEQn7OV4dZbwghs0s=; b=kJP6Dapwux7bJVpTMeIK2PlyHJaXyCyhfRbFm7UjaOAnc0IirmBQoWd4F3Znz67hT9jZ4c+HYulph60Tr0N2d6CMbkXhKZNc4X615+tT3iiTkLkBbuIkE3fWhUjblJ3BE0lozoWV+ojIZLIPEFpa9jQDaM+d2cvhF7WhNpfRi2PfBeU8AAmwiXjvQ8RXNSF8ohWONcff07v+5sC3psQnFwvAKrbZQMkdGEQxbJDBIYkvNmYwVcUR6DPVPT5hoTlhXfEKKDV0vEIALsAmKunTnnG4gfKRAv4r0NEc8rsZMVJI3qfg/fwbg5IDTva4GWIBnFdIOaVUMenN9c6MPYOvyg== 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=PTZ5MSpOK0HsUHp6TzgEdf/FqAcEQn7OV4dZbwghs0s=; b=UtOWEaQXt44Zj27e500w+N44jdMUHXuI2v6jXT7+G13UhV/qvRKFWibNipFDmnMl5klN4fZ4YrRrRoAJFLfs1S79nJ6Np8JKAPBmaXw9vtoCnZNhp8zpHKO8LMyxdfJSYk9HZVisqu2y6XqSEBdi0F3FYWB8zT7OV/g9KVnDdYWTZGmv9nYhFrYA0d1fvnU6By+OVEAt7HqaeN+r3OCsI3Q1Y4i63PXAkLeczj8ND/uo4+/V+od35AN1fz4Fu5kYDqUnbBalftAqlHnzZKxChljObZadeQJW6r6Pl1sICxy9x0zectts+PlMeOhBT8GIPMdFIcYjRhxOEmM1yjhY9A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3768.eurprd03.prod.outlook.com (2603:10a6:209:37::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Fri, 3 Sep 2021 23:18:21 +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.022; Fri, 3 Sep 2021 23:18:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Sep 2021 01:18:04 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [cefIOHAIZ14DGc47tGbrzOVE959kQ1fx] X-ClientProxiedBy: AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210903231813.3346446-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Fri, 3 Sep 2021 23:18:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fbd7aee4-ba87-497c-8d26-08d96f311ee0 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3XsX14DgrS8o/592aMI43cZcGhDfgzByoP8Fu4cr+eAcTG1M++MfwJ1tvpFjBbF6V9oYVq1jJuIhWZpSUMy8uRX/UQKNNOlv7wuqFEJWcPkaFaVJcykoT5ri8shmG2s8MizSqQNqzgu09VO0JlsemfBp1olvvluB7GAlFX5/+KVlGhlqD7CyU40xb0Amfzmmmehwsro8Wx4QLTVhuqeD5/ijENPoqThDbaqDEdfyWWG4Fq18q2qSpx1fav5azoBytD9IvR4UTUAqrWW+w6/KQ32FdBi3QHZQMjbjxPsOW550iOK3f5OFts1VPbhVF3w1iL24js3n03gj8D5EfxiOBNbpEsZzzfExwrHcFmhdwWIg7TFK7/SUVQSY1W4UxwR+Pv/8z2FT8fF+ydeDN27aJtQxZVpOOD0CkMzZ3WAdxlhnjSqD3hFDPTvc+CK62EgM6H8boKR9y1+1dTw0th9wF8lFcN1jxIvLv9YlAKYJ9TPVQiasGuCI5kb7C5v3AQsfcGfNJYvgDGmGP36jc1NyyK5lLsW60h1r+zjJManWQICY3CnARyYShIK7igmtzqhyG/Yeu/ZeIaCMTv8V+Ms2mMtAjj6bvP/JvPycSBHO6LHstkwUPPMeBjsWKz8LCN0LjxH5zn/VRoUuc0QKdRwsqd8FKspd+esfMFbxElyiVyOlaHjMENeKXor5m182PhmXUz224U8UQdFvUqr5xHVQNbbiyhMLTyCTlE= X-MS-TrafficTypeDiagnostic: AM6PR03MB3768: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g2mDycn3SJerf+8OOpwsMOgNYmWLmTWhryshp/m/S3P8eT9tTpPb8jjPrCvUruFKb5UqQFfnnhjcb/W+h4mvBMgKEAzIa5twCg5GtHt0Lc7Hh9vEkDhmMqr+M3o2pZcY5c47pivO9//pR6Ub3qNqEULI9FL7cT0QI1xOpFJ5LJaRornMz/fP+/qOSNTHz0nHLL4VbEa6jOWc81EyB96x8sIfTIKtQt/1sj8+DmcVkyVfbifXYNYZWXHauGzyaC+hDklpPPnf73jfuWVkVyWFjCn7FFUmSbZ0GeSMQRKQN8AKEbuUZIvb67eFQORiTHGeuBtHCSmTyGkefI6zitzhJqxjZJQNXUaOr0qlVevFplKXrB3zyyBUqk04v2pX4r3zoHxbhO3aChD0cKXW4OYBuvoQH9hV5p0SimWkr3ZUEPARxR7bHav820JYfM+Uw56+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jzd3pykKnIunS6rAdnT3CgZeOZqJfpp373Ezwx0iLXMN3We0JNovDg6RFjl4a1Zcn82tFY15dkzzOTpD41IFadHvjmxZjVY7z11gCGuHsLzyszRnGFc4IVD6IWc3mvh84smZpnuFJrQlJAyakckIew== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbd7aee4-ba87-497c-8d26-08d96f311ee0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2021 23:18:21.3830 (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: AM6PR03MB3768 Subject: [FFmpeg-devel] [PATCH 02/11] avformat/avformat: Clarify documentation of av_interleaved_write_frame() 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: NLE9aJAnXiep The earlier documentation claimed that av_interleaved_write_frame() always orders by dts, which is not necessarily true when using muxers with custom interleavement functions or the audio_preload option. Furthermore, the documentation stated that libavformat takes ownership of the reference of the provided packet (if it is refcounted) and that the caller may not access the data through this reference after the function returns. This suggests that the returned packet is not blank, but instead still contains some set, but invalid fields, which implies that it would be dangerous to unreference this packet again. But this is not true: av_interleaved_write_frame()'s actual behaviour is to always output blank packet (even on error). This commit documents this fact so that callers know that they can directly reuse this packet. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 81d2ac38d0..9b560c15be 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2264,7 +2264,7 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt); * Write a packet to an output media file ensuring correct interleaving. * * This function will buffer the packets internally as needed to make sure the - * packets in the output file are properly interleaved in the order of + * packets in the output file are properly interleaved, usually ordered by * increasing dts. Callers doing their own interleaving should call * av_write_frame() instead of this function. * @@ -2277,10 +2277,10 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt); *
* If the packet is reference-counted, this function will take * ownership of this reference and unreference it later when it sees - * fit. - * The caller must not access the data through this reference after - * this function returns. If the packet is not reference-counted, - * libavformat will make a copy. + * fit. If the packet is not reference-counted, libavformat will + * make a copy. + * The returned packet will be blank (as if returned from + * av_packet_alloc()), even on error. *
* This parameter can be NULL (at any time, not just at the end), to * flush the interleaving queues. @@ -2296,10 +2296,9 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt); * The dts for subsequent packets in one stream must be strictly * increasing (unless the output format is flagged with the * AVFMT_TS_NONSTRICT, then they merely have to be nondecreasing). - * @ref AVPacket.duration "duration") should also be set if known. + * @ref AVPacket.duration "duration" should also be set if known. * - * @return 0 on success, a negative AVERROR on error. Libavformat will always - * take care of freeing the packet, even if this function fails. + * @return 0 on success, a negative AVERROR on error. * * @see av_write_frame(), AVFormatContext.max_interleave_delta */ From patchwork Fri Sep 3 23:18:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29997 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1731434iov; Fri, 3 Sep 2021 16:18:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwOJZ9jJBLnf4cyJBpDqGuTrSBwwyiZnRfesvZRQ8nU584Ipp1iPtAICXbzAAlKDjj8AmiH X-Received: by 2002:a05:6402:10cc:: with SMTP id p12mr1384655edu.328.1630711121900; Fri, 03 Sep 2021 16:18:41 -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 c7si963096edv.182.2021.09.03.16.18.41; Fri, 03 Sep 2021 16:18:41 -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=XF9cL5zn; 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 8BC0768A4C2; Sat, 4 Sep 2021 02:18:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2036.outbound.protection.outlook.com [40.92.90.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F33ED68A0F9 for ; Sat, 4 Sep 2021 02:18:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MoWdkkzNTymMUsbQHL0/UwVSAo//+8VOEdLIdOklJ/gGjHgVTNuyDiNSuYo8pNWaKtcmAdrZ87Kuzyo9BT4vG883Kdquj/nRdKD7Oe2OWFrmImAJbtzK0zcBfSXA7noUPJDfIipFk+wDM61z/ZuhmEFRosSUZb/4EGJouqJ0tYCt7SGzDGEL3qbrMgqm/ElXa7kt8Md1Vxdqj8IuDiHdxKGBdsnfdS/DRapLZGIDt/XMecCX7RYmWaEkobIWJfnNKsR9msW+CzdgbrFB982//qrODoSnYGTuPeP2giAz42P+EjWfz9sUNElmk+B58lb+RRklAQ8T/ZANVNUTCKPGlw== 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=EwDLBdK9pzBKODT7Fl8VVBFjs0WYqCMtyQUDL+Fneek=; b=m9onmDiUQOoc3qmE9TzMyRiSpgQgLSvH0eju1Mpru+wcO0m+bQWdkXs1EuiSWBzkBlgIWo/L61EIn+48PZ5dt7da1rYkiMa1cSRzXWHVskxR5DYdDDSKXHc6wWv3k/iXE8LDR/zhP7CPgHxTAXlU+L9Od7Pp+8wgcdF8ArHeubL6MVarz+QNvU+mOO8EyQSo71ZyFbrc43jq7pMNSkyaB71H/OEQ8AgfgsfQvcBR3urPsW4GwZAUb2YG2pUrSZRRyDhxRT5xnMIbIgueE3JmgY0QknDrPGjt7Uc2agXR98P1OyWnbX15isGVItFjEHPBLmy9xd1CKZdWqttj6EfcBw== 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=EwDLBdK9pzBKODT7Fl8VVBFjs0WYqCMtyQUDL+Fneek=; b=XF9cL5zn1gSCHIGQmolw5LvEop5FZdpyPH0YmrIvAa6mmm9OoHoiAugIixrmfzPo7Y3g/6Mg4cxH8TmNUrKja31rBhNsQj5oS/Dp2t7VoKtM4wFPh4WI3fJLriy5MoHUVKFERBnR4g3ynlyMUtLlODUSvbAmORPfYnkO8LMmhl51NXKsr4f9kU9Va0n/zduW/tOmsM55nw/4OlwFTVVX6s8OOzBTnxum0U/OWMXXriHtG0K+YfPpsiNjR0aZb55n5mybNuP2K3kXsGbls9UfWllneJIA86Vv0V5YQkQ1FZSt5MgVKiUXSIJuyHFvycTEjOo9w3YgssNsWcCs3RR01g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3768.eurprd03.prod.outlook.com (2603:10a6:209:37::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Fri, 3 Sep 2021 23:18:27 +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.022; Fri, 3 Sep 2021 23:18:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Sep 2021 01:18:05 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [P+jyebWXfu7Vsx6jDulHTTaxfYhzHP+l] X-ClientProxiedBy: AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210903231813.3346446-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Fri, 3 Sep 2021 23:18:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0fc79124-0fab-4988-3b3d-08d96f31226d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTW2Vzrq2cduMqp40Qh10aEk/7806UxCX+fyjDr00ae+1U/WPgoJDK9ddkqyaIOM9Ivbi4Ge4ORep0npYKxI4u4wAuPmOqoWWg88Ce6gN8p5OG2epjTsiH8GJv+I8L1hGSk8G0SEL9TmKABVTx9uWuhXsDJOfhXFzxIO8LiTbtyt26keQY7HM6kQtkTgrhpTGzhXMhm0K9inkatOsmggD0ESFQiSeivAxlO71vtiOSRl/I6KqjzNmuTIC5BUznZGYX4WEFl8pCf1VyKsqSk44ks8D+4WMDonKW0MxZPaOcey7jyjvA+pwuOMhT13g6PnN+kijLvEysHyrG0Tb0F/5rjp1AApa1/4DGNWg3+a+sPpFdmct8ALAs9kRqJojyMD52PiByTlwN5cCzKaLvIFIZ7vOU8wKwwzPjWGO0Ei6m9qwUCqqdHfLLRBer37/4Yr2zQdHgSn//WtcureYH+tXIbwsd0wiFM1pwFP6lyephdaWXwQ5ADg/3XLhjWpAKaCp10OqIn3X+2eM1opL9YIomQhE88WTgO+JD/QbjE2qD/Gsps9KBr/qm7VQ/zdNj0I5Su8/yaT0H97jgzJ/XPOgK6K9FK9ghtU1KpU9ILVr9YsV6ilXEQdiGEWWoqqsFx3pMH9tegrc//MOwGOdEPYMP6AcKlqNc1t9x6rVKpBbUJJDrG7RRISD2b6ibf81K0AlJNQOFnzXxHdvOIzYh5HCG177uC944rUfYX4jTfvREzOK5NLgLgxyN+VcmZZ95YpXg= X-MS-TrafficTypeDiagnostic: AM6PR03MB3768: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y9QijRsJlrz/2DNl3q0gfnCAYmEUnbNVQfWgYEKD/OE//ESNqhRYsVZkGxINDLVr4b/xr9pxEo1jgB1fhqv/UwVBz2eSe4dRJYrtwLUjiFYPSWDqpxNBounJc4RzJTdWUBJokxdDabRhPZJFChDhH2YDVS0c2NPFMg06Fsba1b8LCAxapGwy2SWiHzQGOz5jkQGJ/QE5UwezALTkkJPEOL5nfI/ClIJpISGaPPHflI0NZLYdKBjkLDAiqVkLtb+qeeNVDaq7n4FbCctJAqyqQrwEIQhdvb8nJKeRs5qnBsY73hA1uS7wPGARd9amUfPhsRL59ug4D7UE3qPKt0jsF8AamyLfF+ZeGWza70ZRwWkAzuY6udyI7E/fXDCxi8Eh+yZDcmqEZm+tupeFvitJJvQ/Zaqhr9r+hqTiBC2n52TVfrEHto+tG9EwqyMTn1lK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /ONb3ZJQglPrVfHIFpeXsM5Y/Z+8WZxII37g3W0Z4aA5jP+JQme5xgI/zdH7RtKxX8KFyBgFOcYXB9kDPXZaV1j/g+/vq7mEIOAcFHmmZY4NLcEThfGkctIXHDvOLDrWc03+fgoUGogoJst0dLYodg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0fc79124-0fab-4988-3b3d-08d96f31226d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2021 23:18:27.3361 (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: AM6PR03MB3768 Subject: [FFmpeg-devel] [PATCH 03/11] fftools/ffmpeg, doc/examples: Remove redundant av_packet_unref 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: 6b21yttTra4d av_interleaved_write_frame() already returns blank packets. Signed-off-by: Andreas Rheinhardt --- doc/examples/muxing.c | 4 +++- doc/examples/remuxing.c | 4 +++- fftools/ffmpeg.c | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c index abc14a8910..879fe06299 100644 --- a/doc/examples/muxing.c +++ b/doc/examples/muxing.c @@ -110,7 +110,9 @@ static int write_frame(AVFormatContext *fmt_ctx, AVCodecContext *c, /* Write the compressed frame to the media file. */ log_packet(fmt_ctx, &pkt); ret = av_interleaved_write_frame(fmt_ctx, &pkt); - av_packet_unref(&pkt); + /* pkt is now blank (av_interleaved_write_frame() takes ownership of + * its contents and resets pkt), so that no unreferencing is necessary. + * This would be different if one used av_write_frame(). */ if (ret < 0) { fprintf(stderr, "Error while writing output packet: %s\n", av_err2str(ret)); exit(1); diff --git a/doc/examples/remuxing.c b/doc/examples/remuxing.c index 13313a1748..9835cc4c00 100644 --- a/doc/examples/remuxing.c +++ b/doc/examples/remuxing.c @@ -163,11 +163,13 @@ int main(int argc, char **argv) log_packet(ofmt_ctx, &pkt, "out"); ret = av_interleaved_write_frame(ofmt_ctx, &pkt); + /* pkt is now blank (av_interleaved_write_frame() takes ownership of + * its contents and resets pkt), so that no unreferencing is necessary. + * This would be different if one used av_write_frame(). */ if (ret < 0) { fprintf(stderr, "Error muxing packet\n"); break; } - av_packet_unref(&pkt); } av_write_trailer(ofmt_ctx); diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index c3df955a6a..f681fa2e87 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -869,7 +869,6 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u main_return_code = 1; close_all_output_streams(ost, MUXER_FINISHED | ENCODER_FINISHED, ENCODER_FINISHED); } - av_packet_unref(pkt); } static void close_output_stream(OutputStream *ost) From patchwork Fri Sep 3 23:18:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29994 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1731511iov; Fri, 3 Sep 2021 16:18:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQAChqTLpCJLw7n54achAbz+qL6FJvbQPEZlcnFvK6qOVDhixineWDLsUvOuR9LuSgvOtp X-Received: by 2002:a17:907:2677:: with SMTP id ci23mr1289092ejc.429.1630711131493; Fri, 03 Sep 2021 16:18:51 -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 c9si650401ejj.296.2021.09.03.16.18.51; Fri, 03 Sep 2021 16:18:51 -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="PXe/73ye"; 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 A9D6268A4EC; Sat, 4 Sep 2021 02:18:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2036.outbound.protection.outlook.com [40.92.90.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16DCD68A0F9 for ; Sat, 4 Sep 2021 02:18:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NF+mLR/J2Z5pa9Gqz9WSAbGnJTNLRLXSmWOcXosy9HUd9UCfuoWEMivwjVufZLBAzpi/Xes2AfUzHZAgBn+U3IcxuW6439n8WTiS8Qc/nBE3JZw53dIfLGCMLZIcv5f9jim5utZy5I8x7zp/HNrF8P4ZxWKzmxQPP0X5P7jls3dGSDo+dkNC70QUlITLpDZ+BGjJPs78l0YwO4TdBlIGjooziHJOFukCFz5qfStMAVIGzouN7WKetMEgGDeVpcYQomnmKi0aAn0qpBS0fU+wW+eCaYpMxlxoM8zqCPQCjh5KIrIhQvNKRGpzaVzcrkyvV7lW+9GHs7K3BzAXnYOJEg== 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=5l1Uyq6sHUGE4dmHc/UYPZ8BVb4Bz2R70giEvwiuQ8s=; b=e7ueM+1KZ3ahUEsiTpTiwPsCVx8TyXSxhI4ACR7HSPWYuT2SmkNOwkqKfNfT+3ImNO/49gtVZbpH7SLUBZyzjXkuQcZt4w1ed2/kwwSP823JEpH70nuO4R0tM4QlfGh9mH8GA3OKPE9vkGUWXS5ZpsvkzDoRkM+P2fm7gou4qDHQlRB6elDjAAycuN+S1wr7I4Im01UIoneOPf7SyHioc5asbo6DHnmpJhUkLbYOlyRSdFuaMLgyDoKyx4pcFhCBfi7c7KfmJdbJ+eKLdkkAO9WtTAdL6FXFeRdXsrxd5lrg7rhlVZKQDG+RMDXXWFo5VMy1DaNcmJhDb1m9E43ROw== 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=5l1Uyq6sHUGE4dmHc/UYPZ8BVb4Bz2R70giEvwiuQ8s=; b=PXe/73ye3i8mqEEnuoI+6o7LwCoVX9duDk8cw1Sjq9ZkX2GlazaOWj26ATG7BOPVyNqeik9Gwe5+sHAlCebwPXNiYrsQ/mJMZsacWEwSEqzumjmpc7/tyQXwlkR8qVpa+lryL9bd9gBvulpXr4N8i/vA+58QJXSnHbzqwaVFtmeBZXTTAi1j5Gpm2O7Um/B2ajfOMp4AVHjl2i0Cgh3nUv/EK7THAFGqSKb5gky3vkgpeZU0ywuMK23xMSNTLQAqTQW8MbfnUbhGJO7K0m86PcehtPIZ3bBE50efegr23qZ/KMKYcaIvFkCSFvvalofOtrN/Uu91ynHnB/GzFRdpUg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3768.eurprd03.prod.outlook.com (2603:10a6:209:37::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Fri, 3 Sep 2021 23:18:29 +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.022; Fri, 3 Sep 2021 23:18:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Sep 2021 01:18:06 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [9nH5W3fYJZPeSBCLZ7J3oDciDlxfelFW] X-ClientProxiedBy: AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210903231813.3346446-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Fri, 3 Sep 2021 23:18:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 89b9ea23-cff7-45e6-e3b7-08d96f3123b8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNV+qq5IRDRcj0clRYfBdlFmQQBsf8uecLJoVsna4ERSi3PQomkyKyI4+62WjCv8FpwJFjt0jtVnv0m86ntxNKdwmiATVlMHxyA5/2FVX1afb9wuaN3bvFC/jdpVmERPi6ediFEInjbxANGD0z8AAWMU5zYodgZ3htkgEFUcaIkS6bJH+y46HzYL/aiNIg0Dl3hf7WZxh1GnUlsSpcXRfouEAjDc71VqVOtp+GO4vHB3dbWj1JWBbx6fHqMHm6umVFNLW9JCmxJYmiFNfDLbB9vM9LxWvWruOnNbDvYMB/h0zbHiXCWV8xJvFepAoxS41ri1NNr53tLwN8j8jpUzH2ItZg+f5FksJ6wsSKEolhihIiupNXGS10QSlmOzJAjbKug8OutmQKse5foe0TPXB7wTr22claSCpehycgF/6cv6hobHP7Guxy6sQY/QRMyTyfssPm+BqV/Ilv+fqTwCU7iS6/LOrqms223TPUJy8iA9nMYhkr+aguiReCMlcOAzmB2EinPXPIEy6NDd8S5QNwe0vfD0H/k+GT2XfPCQ0TQdTBS7MvJBn+dzmpjZkwwxpMDA76GHn3qx5pjVp1fJwJorbK/j7FLzyqPa0PgVvNT+X1fjGhc+YuhnOrzMtO59N+NNEkCWCZcaG89mp7PK50FU15KmxNXOjqmj/HrHrIyHen0USONdLEJ00RHMnCDa19WHRNl5GoX47vmvUwjTstPAFXm5TpZA2ZE= X-MS-TrafficTypeDiagnostic: AM6PR03MB3768: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M5FGRcFPaqSqgd0oLuyw9U+g4lxfOGFSWvIaG8ZA/k5yRdVw+QmiQQ7DIsFxJpz8yYY9FjCnH8MgMVkqW8taU6ISzWd1+tmcVzrRPuwIE1OxmMdwIgrY6cdpAeflG+xBmivNgmUsDumQVVQK9OHi5Qn1R4qFRhwnk2Mui1iWt+EEBhlqFv8pbRjpqsnMw/zfFUUdm6duQwGT88Z97VevJHXyjxGLvDt4KMKSg26xdKjBxnn5V5U/v1ld3x+WUNx9XTBjLO3CVROl9d3DeHBDRbsppCJ7mzJD6BxMqiMh7wHxnklYgEy5q4Y8Mcex13yAmkIpl+J5XlC237/aGZXHKWhtGYXZ7AdddKmprNE3PjUzOyF11vsw2VCUL3MfJbyZNvr9SMq7S0b0ajrPzwBob9vgNaraixA6jdvtadu8AQv03h9Nlkh4941BQnp6fnPa X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZrUvTLitkGNpZ6PAjgl+PHXxJD8xLEodrm+qn/aOJaXWX46PoPhw8I+xsWWeXv6rfTonmw0xOJSPswKzCThX2dwOt2Ocskp/Jct74upelasRxI5Rif0Jt2Dh8UGWgS3cLOd4UHALDutFIMNwW4jwKQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89b9ea23-cff7-45e6-e3b7-08d96f3123b8 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2021 23:18:29.5943 (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: AM6PR03MB3768 Subject: [FFmpeg-devel] [PATCH 04/11] examples/remuxing: Use av_packet_rescale_ts() 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: uKWUX+jnZa6M Signed-off-by: Andreas Rheinhardt --- doc/examples/remuxing.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/examples/remuxing.c b/doc/examples/remuxing.c index 9835cc4c00..b23431567c 100644 --- a/doc/examples/remuxing.c +++ b/doc/examples/remuxing.c @@ -156,9 +156,7 @@ int main(int argc, char **argv) log_packet(ifmt_ctx, &pkt, "in"); /* copy packet */ - pkt.pts = av_rescale_q_rnd(pkt.pts, in_stream->time_base, out_stream->time_base, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); - pkt.dts = av_rescale_q_rnd(pkt.dts, in_stream->time_base, out_stream->time_base, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); - pkt.duration = av_rescale_q(pkt.duration, in_stream->time_base, out_stream->time_base); + av_packet_rescale_ts(&pkt, in_stream->time_base, out_stream->time_base); pkt.pos = -1; log_packet(ofmt_ctx, &pkt, "out"); From patchwork Fri Sep 3 23:18:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29989 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1731627iov; Fri, 3 Sep 2021 16:19:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwS0Awv0fABmrWxlNHL+I8iM0QzGS+iAhgOX9kp5hD0KeZWIrslomhexIZuwVM2thtp7eEO X-Received: by 2002:a05:6402:1cb4:: with SMTP id cz20mr1455680edb.0.1630711142199; Fri, 03 Sep 2021 16:19:02 -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 j7si515272ejm.280.2021.09.03.16.19.01; Fri, 03 Sep 2021 16:19:02 -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="rDkDXrw/"; 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 B952468A56C; Sat, 4 Sep 2021 02:18:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2036.outbound.protection.outlook.com [40.92.90.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 31B4268A538 for ; Sat, 4 Sep 2021 02:18:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gJdvPdAKbKccKzgC/0ieaj1ca//YNUWJpU4LpVDoooXG5icOO0FR6Ro+kx4tDex1hafH2l/zprLcG31F2fDiYfStJVmcmKWmpAAL44SgWZtTSRXo/rb/U7kbfrO/DQWHEPWDLRghtYSo6yR1qED4A7ec6RtnreFUgvtEY+rnoWn84oKjo0YlfVHqbJWdZ3DR0fjjW8YjtZMgGI2OPfYhzpV5LgHuDcGZzhHHbb03Gawxrrduaf9RShghLC+QE6QzV7gomXKQSJXxpUc5AnZHEbHYJFgwFF5YP6UH9QCLrc+QX2Ai85F+xAM/UIhPEaM/pxCpguYT/qaILH4JqqVT2A== 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=Zlq2Rnrpft2pcuo9uTS8WzTGThAWHfN1YhleAI3Cj6o=; b=j3qpQZmyj9r9FrfpG1xRHrIw5lMD19GONv60Ka8kvWgOBUsezKwAx2HWjN0R/hjIICGDPQpwA/kFFVAp/ro1xjGA2swx6RFQtRM1vmr8QPsMIIuFa12ZLBa+UL5hNbmUSeDOu31DOtkUBbru+P21EjqIcWNFsl1gKmLPEkDBhKv6aKXDj3p/AmjOcX9hFKzRCr9oPgzdNOH9UnLLmQKx/3+QN72j9IyhsqKakQjAnV1lWc5kRl0BCnyDitwbQH0vrFoe10M66Xdwnt/P1kWvnRlbVJKwmtRc9n3fWRASDJq/ZGcLaW5t+JlYectmFkF9IiRDRX/JpfgMpWY2TH60/g== 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=Zlq2Rnrpft2pcuo9uTS8WzTGThAWHfN1YhleAI3Cj6o=; b=rDkDXrw/dXZOU5jQM0VLXbezMvdfNLw4pYHC/El6ImVGtftsxoJAukW6EkjANAau3yYyX2ZaD5xco2bK4yNa/8D9IDMVoFBo6IPfBFb/DL9TUKd526FFL2FZeeDcXJ9dPW1ObgmMJD0rC6InaANjGeix59kpCeZFfY826iPmoz1TIFyP3V9LNVJMIKZ14UXriSrucpR5BhXCfLgmE2Dbu+yn8YLxgjC+g4gpX1cZoFrD+tCoZEedLKQiG6sDmkuR+OAHxGS82gnYZ2HWT8D+A2Ki2vQo1A40Jfg1Q2rU5qCqP6VunW60k1TttVFWex4jdZJBXe8FGT53KKqu9ugXtQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3768.eurprd03.prod.outlook.com (2603:10a6:209:37::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Fri, 3 Sep 2021 23:18:32 +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.022; Fri, 3 Sep 2021 23:18:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Sep 2021 01:18:07 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [HVjoMS3B04iivoRweTUeqLBqDqxv2Ieu] X-ClientProxiedBy: AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210903231813.3346446-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Fri, 3 Sep 2021 23:18:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4d5655e6-3b48-4b7b-b562-08d96f312577 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTW2Vzrq2cduMqp40Qh10aEg4HZQ6icyxatl3+fPS4i733FWOD6AzDuc3dz5UC0KmG59Wcj+GUPif7ETUhLPISm/rvZyjdCIX0l8/YkpI78n1+alOJux3npLDZSANdvi0q+RdgmF7qtZTrYS+SP/Oa0rGHSPVLFnYkmzOLpEtuBNwLQ0u47CbabKaraJkeV3j1wtsnnFnEmRlEKGeyOI98zuUom5130KlmIq4SLXpDm1FeaF63MdmjqXUj8i+FbhPp860dOWbVDRcAwYQWvIuGE/sXRsV2CjJfDDJjbNo0XSJfuYV9CNhr61kNGOo+3b+JFuPXbHkqe1OaeBfmcHvsSnCOWWZ41o3xnUsSOTlX3KtP0BcuAPDAIOmCyzdfoKNW+kyIWuZPbTC3glFQ2NTq97kEkTm5RR/cMygllR8sThvK4x3IchLiry2sKkqPk7PkI5KcV3CWQoG3ilTvJ6yV9G6m69G//Kp4zNYqkXuPhz/CGlZvZyIrisdFHQ/iupukk+UI9gHKkK+xP2C5w7WaExBxMpBBWhoZzdB7yBVSYD0ZdUjbznueffliZhxuPty0WLaQR/WKzvRC6oVEDQ5jgKq4kbGv71m2s6rVDqMMrKM80QZz4zmJD1haHGQqI23tbxcyCOJW7ZvTs4hZ/QztQLkKcMwmuUkDd3e/ka+n1ZksxEvFii8PeUUSHT8eonLpVdFYFKMMvnKKf4E6KHbNdfc3vtcQrdY93Azr1HLLDpXnPKIIMmwemN8AJH3NPHAE= X-MS-TrafficTypeDiagnostic: AM6PR03MB3768: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HOvI55wzepFW15pNkXkeNiaSGGStT+2rzT6KGbEtvvfdnF9t4Ojq3n+5yHBe9AUAGMgPKWOioqIdPHbvVZl9ryAzhy1EIb5tKilcA9k1qAKVR+EkRkRjIECtBqfy9bKtQsJRFLSm8mDBU9bDbb2qZFA8FR4PNONwBlWeS5OB15h83XyFP1jOTdG2DZCS21TcKwV1FDhvZEjJcBBlS/B5Z6iehGV1hGNquUZqQ26UtZTwgICfr9jbBiZ4nePWb6h+r4ZDcZEequ3DJz7ThmuZeKFWbPL7mdzvwZL4egYmFZq46OmmGFHO6fQBz1omAfC1gsZbwWuz58Plx1E6Pp5LhAh0DwybaNTQA3yr+Z2xdTotNwVb10e6X71P7ewi8XViC1TouDyjIRSEJBykH6DAJdGd48l0sEYTQWC54Z+lAJUPa/5Heb0zk4S+dbAknwlw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Vp6hAsfkol3hMcml0aiBLEhKQXR8ceOV3g9iKToGtTUrNCiCr4orZ3sADDaF8m2Wtm5SvqGasIbSIDOr/SgNzIsSkk+91qmRn5F0vy6OqS42xNP0VfIjeKuxtg5PS2cnrmnUQ4nZ8DWIkzCdeMc52Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d5655e6-3b48-4b7b-b562-08d96f312577 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2021 23:18:32.4220 (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: AM6PR03MB3768 Subject: [FFmpeg-devel] [PATCH 05/11] examples/remuxing: Don't use stack packet 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: 6I95rE/Gjso1 Signed-off-by: Andreas Rheinhardt --- doc/examples/remuxing.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/doc/examples/remuxing.c b/doc/examples/remuxing.c index b23431567c..4e9354c535 100644 --- a/doc/examples/remuxing.c +++ b/doc/examples/remuxing.c @@ -47,7 +47,7 @@ int main(int argc, char **argv) { const AVOutputFormat *ofmt = NULL; AVFormatContext *ifmt_ctx = NULL, *ofmt_ctx = NULL; - AVPacket pkt; + AVPacket *pkt = NULL; const char *in_filename, *out_filename; int ret, i; int stream_index = 0; @@ -65,6 +65,12 @@ int main(int argc, char **argv) in_filename = argv[1]; out_filename = argv[2]; + pkt = av_packet_alloc(); + if (!pkt) { + fprintf(stderr, "Could not allocate AVPacket\n"); + goto end; + } + if ((ret = avformat_open_input(&ifmt_ctx, in_filename, 0, 0)) < 0) { fprintf(stderr, "Could not open input file '%s'", in_filename); goto end; @@ -140,27 +146,27 @@ int main(int argc, char **argv) while (1) { AVStream *in_stream, *out_stream; - ret = av_read_frame(ifmt_ctx, &pkt); + ret = av_read_frame(ifmt_ctx, pkt); if (ret < 0) break; - in_stream = ifmt_ctx->streams[pkt.stream_index]; - if (pkt.stream_index >= stream_mapping_size || - stream_mapping[pkt.stream_index] < 0) { - av_packet_unref(&pkt); + in_stream = ifmt_ctx->streams[pkt->stream_index]; + if (pkt->stream_index >= stream_mapping_size || + stream_mapping[pkt->stream_index] < 0) { + av_packet_unref(pkt); continue; } - pkt.stream_index = stream_mapping[pkt.stream_index]; - out_stream = ofmt_ctx->streams[pkt.stream_index]; - log_packet(ifmt_ctx, &pkt, "in"); + pkt->stream_index = stream_mapping[pkt->stream_index]; + out_stream = ofmt_ctx->streams[pkt->stream_index]; + log_packet(ifmt_ctx, pkt, "in"); /* copy packet */ - av_packet_rescale_ts(&pkt, in_stream->time_base, out_stream->time_base); - pkt.pos = -1; - log_packet(ofmt_ctx, &pkt, "out"); + av_packet_rescale_ts(pkt, in_stream->time_base, out_stream->time_base); + pkt->pos = -1; + log_packet(ofmt_ctx, pkt, "out"); - ret = av_interleaved_write_frame(ofmt_ctx, &pkt); + ret = av_interleaved_write_frame(ofmt_ctx, pkt); /* pkt is now blank (av_interleaved_write_frame() takes ownership of * its contents and resets pkt), so that no unreferencing is necessary. * This would be different if one used av_write_frame(). */ @@ -172,6 +178,7 @@ int main(int argc, char **argv) av_write_trailer(ofmt_ctx); end: + av_packet_free(&pkt); avformat_close_input(&ifmt_ctx); From patchwork Fri Sep 3 23:18:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29993 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1731726iov; Fri, 3 Sep 2021 16:19:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxr6hIJzbxdAvRgZ5hop/TfVQj0PHCV5nDkBwxqF9ngQ+J0W1uHOsB+HKn8/IEi7/Y9dkuo X-Received: by 2002:a17:906:b14d:: with SMTP id bt13mr1350426ejb.39.1630711152417; Fri, 03 Sep 2021 16:19:12 -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 c17si714895ejc.333.2021.09.03.16.19.12; Fri, 03 Sep 2021 16:19:12 -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=KvQJQk+K; 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 C5A2268A588; Sat, 4 Sep 2021 02:18:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072037.outbound.protection.outlook.com [40.92.72.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EBDA68A1CC for ; Sat, 4 Sep 2021 02:18:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=luXDHJjQDh0lXdoenWBVxC5KVyeBcH5AUN/VUEhzBQBHVa4s+mNTSv9Yk9gNPBIwsgwNIACzKpo8kXEokrBo5V9hdvRZxCZxBKWwTIh3w3bF5xnf5nHfAo+g4RYO2oGN6wzmsNhgP4gbiIBj9m4CkL/4ZXZHa7vNhKNLzuXm/AAXEpQ6Wf3cCdBGoO/1PTk99kiEXHlZLv/popdILcPzV+hJL1/eAYoybgd7iSS1wpV/ty67eBdet9i3uqNY2Q4EUknQyIAorSmq99wmy/dYtsM4rWDqhGXRVdIb1Er7FayUuA371mc4o5YVIA0BEliwvkSmr+zfq6bU2ebw9fSlbg== 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=Z9gnVgXNYJqv7S7eVO1zcBeTJquz0G5+Qubu4bcQ9Rg=; b=CscSC+SUY4n+z5dC52EHxSbdTzIjOFnCigXlo1Yd4GX9DFg8XIBFj5qr/lwdQe1uAUgTQNJH8t00BVYJ0szIaEa/gYQX3aanGs0N0wIzFzTIwBTQCy25jbhJ0f5SIoYCpceN7V/T9WiwZ8xemhBFsGVafTcsmEkfFL3YRYbSjQI1equiiQ7PTSrwEh5jclbBUaWoh/RY9ZjOHdIDH2dLQrxo0QTTS5dWePe1fSxM3BWNALSC6mdMxi1kN4NdXNfw6+0RtgUrR393jzby/S4tYt68+2RQnvtg8K2iu+5ETFy5+vZCgLo+8KjAcGsLaWe/Ucz47dfs2pf5wnDMn7rWlw== 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=Z9gnVgXNYJqv7S7eVO1zcBeTJquz0G5+Qubu4bcQ9Rg=; b=KvQJQk+K2ns8b9AbLVdWdd+XtymvCP2z5UAf5BcMr9UMdwzWxzdOgw0MMNdsaw4LozGEkFqY0B8IgAYmWQOWt03h4lYmPI8BD3tjQWK6xPzzxngOIn6BV/CLJrsbfSaXzRgbOKRnsh4CE28YnM3E6DYGrQHtG9/UERpimKWGX38/h9yofpC2E0uk7wZXwmAM1PRJYCoy1+5zDhUA647P0o/X9tSXdIu2eKA+N2RZUSwqXYGOElBcELuJ3vvjGobRHRJQ/ZaDnDIMzSAd0Kx+4v+hNULs02PTwXhFmdCAMPXUeMJHyYDQl11L9WQPj8qxlSSRTl0NA4vZpK/EHV+jqA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3768.eurprd03.prod.outlook.com (2603:10a6:209:37::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Fri, 3 Sep 2021 23:18:33 +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.022; Fri, 3 Sep 2021 23:18:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Sep 2021 01:18:08 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [1NqB1L/H4hhNHKXByzuO8FrsoVpfFQ8A] X-ClientProxiedBy: AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210903231813.3346446-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Fri, 3 Sep 2021 23:18:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3581e07d-6195-4fbc-04f4-08d96f312622 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTW2Vzrq2cduMqp40Qh10aEg4HZQ6icyxatl3+fPS4i76Mx0PRhPz4m9auyCV0INTmTvMhmdOp/9YVt9iCmGWfTtr8pmzmuse2abhIxMyvNZLJ81R3gf/T1ZUgsxO7vLynKb5xNEHIWZXnmVHMssEb1dJDPff82mZWbTmHvkEzKC0ru4NOoh+Nkc+Ps/KcykJjYl5gJ8N5Mi9FpQRZ87xp8/8ZRR0HYFZDKNekq7MnE9uzhgjPN6j3P6+N49sicGVhXXfHENa8OKdbdKpDBxCnqWiYzkphU8ueI9yGNUKH3kR1L8VlbDC2XgnGLBOzzzz/iDnjRtXZRqA2nLeejYq1AHha+wzHdsa081OF8qTCCC8vRfswivux0upYFK6jE9R6upjZqVs3n30ZFGSklEUexvmASA0m+ZpxFLKme+c4Q4HjRaJh6qKcHQ0osDH7EDYoL0q+PxzYakVcJDNq5yMSsq0G6G0xvNhBQQ3ppMXL5G+akUiyFCPu2uFZsTb42axc8Hy64jp2kwAU/50uIzlvTUZAMGhvSOgnQK8FLEfkSSfiBXm/lz7cqrSLhar4UUg7mAwp5GuA4GptGOxZJbBH/fKBWyvAqkatVd8iGOTkiJAp0WdImNRAw7yHuW13nHFvE1pYl7c+Wh3akMmD+m0gPzdBFUJKzlIiBSN8DDa0Jzt3h/yfwNjolBp+X3IFm2nRutjExm1bKlR4G+bDjRHcbt23ZBWP7WEG4GW/clUyu/ih+ng1q4bNrjbHk2t5Ou7A= X-MS-TrafficTypeDiagnostic: AM6PR03MB3768: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eazlVvzFtak54StCHFsOn2xEnxNQz66W/5blV2iCVBwyTO7t+5nn7iutone2q+GA4V/Tv9dLi6N7L9dhdGHdbqH9MHZ6YF6c2Hk9UluvZy0KCLUvKEruOg82pKybnHtvfSlnF4GK2HCV1xF1R8irLENv6dko9Osd6BxPgLYLHTLa/atdSesv53ix3fFqOaxifY9VcFMsavJBLlhxc5Ej3Strv82a9wK2Ze1Rpm+3iac86sPjYdmCmgmDye5hkcg5zSHbTXUwc4ysuCwxjLDIvVJLWHqU5AK1YEcuat4G/wU2gJSZRPPy1pGlA6CbE728ZjlvhKdOSUGFfz3KRRTKrbWIScOnceXao8GUPDwovQAPh1W89ovQnoLXVB+6KFYoODXnnySkdaccjt2DzCMVxt1jjxrlK4+brpsef1qmYN01s96Q/hrObqOQWKR9Tcgw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: O0aELGsMvuPoLMF1qG6ZcDKo1idfXq4eiSs0OlmfHx27L0lVffyLKc9n7MijIJTweVEnFwU6rFyCDsCjYOQ2oFWmWtds5GYCmAXBLOozxe1XnXDpj2diD2Z7B3e/k90nartDclP61fQnip62mKQnTg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3581e07d-6195-4fbc-04f4-08d96f312622 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2021 23:18:33.5511 (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: AM6PR03MB3768 Subject: [FFmpeg-devel] [PATCH 06/11] examples/muxing: Don't use stack packet 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: fO17j6YvAJy0 Signed-off-by: Andreas Rheinhardt --- doc/examples/muxing.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c index 879fe06299..8a11e52842 100644 --- a/doc/examples/muxing.c +++ b/doc/examples/muxing.c @@ -62,6 +62,8 @@ typedef struct OutputStream { AVFrame *frame; AVFrame *tmp_frame; + AVPacket *tmp_pkt; + float t, tincr, tincr2; struct SwsContext *sws_ctx; @@ -80,7 +82,7 @@ static void log_packet(const AVFormatContext *fmt_ctx, const AVPacket *pkt) } static int write_frame(AVFormatContext *fmt_ctx, AVCodecContext *c, - AVStream *st, AVFrame *frame) + AVStream *st, AVFrame *frame, AVPacket *pkt) { int ret; @@ -93,9 +95,7 @@ static int write_frame(AVFormatContext *fmt_ctx, AVCodecContext *c, } while (ret >= 0) { - AVPacket pkt = { 0 }; - - ret = avcodec_receive_packet(c, &pkt); + ret = avcodec_receive_packet(c, pkt); if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) break; else if (ret < 0) { @@ -104,12 +104,12 @@ static int write_frame(AVFormatContext *fmt_ctx, AVCodecContext *c, } /* rescale output packet timestamp values from codec to stream timebase */ - av_packet_rescale_ts(&pkt, c->time_base, st->time_base); - pkt.stream_index = st->index; + av_packet_rescale_ts(pkt, c->time_base, st->time_base); + pkt->stream_index = st->index; /* Write the compressed frame to the media file. */ - log_packet(fmt_ctx, &pkt); - ret = av_interleaved_write_frame(fmt_ctx, &pkt); + log_packet(fmt_ctx, pkt); + ret = av_interleaved_write_frame(fmt_ctx, pkt); /* pkt is now blank (av_interleaved_write_frame() takes ownership of * its contents and resets pkt), so that no unreferencing is necessary. * This would be different if one used av_write_frame(). */ @@ -138,6 +138,12 @@ static void add_stream(OutputStream *ost, AVFormatContext *oc, exit(1); } + ost->tmp_pkt = av_packet_alloc(); + if (!ost->tmp_pkt) { + fprintf(stderr, "Could not allocate AVPacket\n"); + exit(1); + } + ost->st = avformat_new_stream(oc, NULL); if (!ost->st) { fprintf(stderr, "Could not allocate stream\n"); @@ -380,7 +386,7 @@ static int write_audio_frame(AVFormatContext *oc, OutputStream *ost) ost->samples_count += dst_nb_samples; } - return write_frame(oc, c, ost->st, frame); + return write_frame(oc, c, ost->st, frame, ost->tmp_pkt); } /**************************************************************/ @@ -523,7 +529,7 @@ static AVFrame *get_video_frame(OutputStream *ost) */ static int write_video_frame(AVFormatContext *oc, OutputStream *ost) { - return write_frame(oc, ost->enc, ost->st, get_video_frame(ost)); + return write_frame(oc, ost->enc, ost->st, get_video_frame(ost), ost->tmp_pkt); } static void close_stream(AVFormatContext *oc, OutputStream *ost) @@ -531,6 +537,7 @@ static void close_stream(AVFormatContext *oc, OutputStream *ost) avcodec_free_context(&ost->enc); av_frame_free(&ost->frame); av_frame_free(&ost->tmp_frame); + av_packet_free(&ost->tmp_pkt); sws_freeContext(ost->sws_ctx); swr_free(&ost->swr_ctx); } From patchwork Fri Sep 3 23:18:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29996 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1731913iov; Fri, 3 Sep 2021 16:19:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvUCJYmIp7ur44LZAAOw6rGPoVYitxf34PzsL3qEPP5/f/U8tP0hXhIIBv0kZ3CpCKWwjo X-Received: by 2002:a05:6402:22cf:: with SMTP id dm15mr1391552edb.393.1630711169846; Fri, 03 Sep 2021 16:19:29 -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 f14si779173edf.461.2021.09.03.16.19.29; Fri, 03 Sep 2021 16:19:29 -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=oVoLm1Q0; 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 0BEF068A583; Sat, 4 Sep 2021 02:18:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2036.outbound.protection.outlook.com [40.92.90.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D19C68A1CC for ; Sat, 4 Sep 2021 02:18:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F15v96byWN/AcrffqGkXAoG8jeMgmWSxrxfwiGjEyPwdCEVmgke0Nm7l3+vFEyeycaDQ052yxsiNcW1c1+1IGv7U+JpSqtgJLHjrkXnDtzfMxpmQmS6ynFlSLRfSFqiVNbDx3pHsun75cx4dPIHctGeAT4un7KyA93ZOuK+nq8gHuktJ5lyKnBWj34HnHzfynuJmm+ZAHuLAO1F5DjJIQNXmpcLcR67OXkF4PtyVa6Qyo4qch/qwteodYgNo8u5tkF7KufkK2/DLyVjaaSBGUiR6xF+BJVHlD6penJnOlIcmiN2LsdHEI6UYjyRUJGwbq5thyv8O4szuDCz3H6toAQ== 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=g8eDWjZ8QhSuw61pJD7QGsSk2P2OAQAie8emhi1xgMw=; b=e9M0w9dLUL12JxZ2tHRpWdFaEFZOV5UTSSCWel4cjnZB0k8wUVHSfoC+ikCgLnpKYzENs3FtHEHNDyKXvUyMBJWMlyYla63KQM1UDAFdWbl9DQbbTQ/DyER7WB3By5Obbel9xFPrbeNCnf85hmnAQJYZm8lBDw01bcCuAg/yqzojrtXd5C1olmRTp/UtADTs2GdqJW3aC9tIIii9j/JHOTGwe2eCjPgoQn5Ipdl6/RugcIFQkbeJI6pri84MbNrwA/f5CwWTEvFvREp/3im6YNId7TgrtlGtmKVqhsLmDyrmuWasHQMMg434/8km05hm8k+7+6sKmD2bEBWiAiuGWA== 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=g8eDWjZ8QhSuw61pJD7QGsSk2P2OAQAie8emhi1xgMw=; b=oVoLm1Q0oo5+7ptPpk2SNhWVoKePQBaMVAd0euJtGIgUwS534BMaXJyGZ9HNsxoEH1XPOkqBEU+ZXyAYvOlJIpziw5RoWZOgxYae8Ce+c5oNxfx9iV44E4lDMiQdU4U5vLW4HN1+gYE1GpOJ9WVBxpquZ903b9xkOL60+RPGVT154HCXORrvZnFUTKFoUs3FijL7THQ2dEX/pfFAATpQBTUgrkHmUotzKZ1MJjLTa22vIVC0EC2V2SPou29HeetNPqAHVrH2/y9inpbVqQqvthP6A9DwIPYbCCP6GeajGlcZ9qpQ5Bv5HxQade92ajFJK1+N/DFj0XKjWS13liYnEg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3768.eurprd03.prod.outlook.com (2603:10a6:209:37::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Fri, 3 Sep 2021 23:18:34 +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.022; Fri, 3 Sep 2021 23:18:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Sep 2021 01:18:09 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [W1annsEd7OvOyk2PNratNOUJ5CTcjnjn] X-ClientProxiedBy: AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210903231813.3346446-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Fri, 3 Sep 2021 23:18:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84226717-6889-4f5f-917a-08d96f3126bf X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTW2Vzrq2cduMqp40Qh10aEg+jLjWYBq+n2FY8AC99XvIVztqRtwLdTyc1U4Zzc/6TWTIVyqXMFtMq/Y3P/x2x8quZZWxpisayAuGmdf2awy0/fiX5eyUToR9WtlGGyDjVHzecNGzqm0sIO17khz1VY4Y+gG8aDLt2Z6qGlLPJu1AWTNMu6p3+ffSBzI1oqepb61oe1scCsOTnYJk7HHVyiolE4LOwPdjDBZotlodPVldZEHK6n7radrj0A9vWI6clz/C3tsTb+ddD9v0EAcCzrmD3A5qaXwKg/bkhHlvRtoZUkTV8/7IuKTOOk9rnD+6w1V/HLueFzQSKs60gMR5vxHwtwD+XO1K7jU+q/a6r5dpbmXbI5SnjWTUvbo9L7YF5Q8vnaosPSqIEnYpwfXzj9m+cFrZY1JIN3FuexoqS6O+zmY4r+N/ZfG5Y5CD49bwwN94biMdT5Xcq/rqpItHpInU+Pv5VPggOHD4UX/Xe/EBvUuZOAafdziHptSiEP7oHeU366LFNePrc7n4c+FgKhvzbldiZXC8CIujjJDTT0GazMApUX7rD6dCZ3RCb9uRXA6COz8unACWpVeIc5yK/w6DTKLhgo0+SwjcdZl8bDGha0VU4DS9mDAIJ2/nK6hsazMTJ9V+xDQhPW6wAMxEeaTgcropmKj+OsklHw+fbBfCuo20KUZux/nQW6e2rQNQTLrJ0tmRMmnZTBp7geRGpCN4uVcLFnsFZpeCXSAJo4zeLCy4yrcJOtJtv6ngsRGfM= X-MS-TrafficTypeDiagnostic: AM6PR03MB3768: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vQKdG9qRGFID1PzQCuXOmRxzWYFyf+gz9XyLPf1px6gbpn1bRIxleRI6CCtM6Dabqvp74tYWCsq1vVEp8qjcrd+72IznL+/Meewxq2Ilbr5CCSroHWORvLN947G7LEFPoU0xyabBg7z03vMCT29W+qTRBgpkOzuqPvsgLGRIIjq1wRlgoIf3cPQO3g3F8iXVSMt67s+V3fB8oBla5ybWGaiIKPf+gZd2j2URTL8MS56g1uh2+vNuKJkEaEDnC3oYBiwfVfjG3s4gNRvkdovwLy4rfzsL1EbKOQvylTv4syDs+3SnFOpoGBQIaUvAlCn5r+6LryvlMSnJeDiBn4vHd+y2lAV/9Fd7G4576/E9UZIyJNI/hm0xPTd+nppIkVp9e+8WljFCmM9Y2KphVAZJ2Rb1kzmPl7evuTUrqATJXNqXS3QlxezraJ+lCIiaDwRj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xL+AeLpBU31g/PHncAu4tiMHWJ8nF5b/L9g3hDKrWcVaSaVxqZw/kUkCqag5SCYsbh5jp3Jd4esQ7jjbVK9F2wbsaRpbx3SFedrjnT1bnuFhGHjiOo+qHzs8odHJO2/Jsgjd9Cy9R1kSp0gsqD+pNQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84226717-6889-4f5f-917a-08d96f3126bf X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2021 23:18:34.5557 (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: AM6PR03MB3768 Subject: [FFmpeg-devel] [PATCH 07/11] examples/extract_mvs: Do not use stack packet 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: FqDmzxNFPUKO Signed-off-by: Andreas Rheinhardt --- doc/examples/extract_mvs.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/doc/examples/extract_mvs.c b/doc/examples/extract_mvs.c index 84f071075a..cc1311da91 100644 --- a/doc/examples/extract_mvs.c +++ b/doc/examples/extract_mvs.c @@ -124,7 +124,7 @@ static int open_codec_context(AVFormatContext *fmt_ctx, enum AVMediaType type) int main(int argc, char **argv) { int ret = 0; - AVPacket pkt = { 0 }; + AVPacket *pkt = NULL; if (argc != 2) { fprintf(stderr, "Usage: %s