From patchwork Sun May 15 17:56:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35777 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1214295pzb; Sun, 15 May 2022 10:57:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXHFc+FiBX6kwrThh8QMhOrHT5BfIH82Lv32seZbIWKIRRl4ccGWKhsWgETu1iB91QuSeZ X-Received: by 2002:aa7:d659:0:b0:42a:b0d5:a64e with SMTP id v25-20020aa7d659000000b0042ab0d5a64emr1721127edr.157.1652637440555; Sun, 15 May 2022 10:57:20 -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 hd9-20020a170907968900b006df76385eacsi8516880ejc.844.2022.05.15.10.57.19; Sun, 15 May 2022 10:57:20 -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=pDKrp0mm; 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 50E0B68B4B4; Sun, 15 May 2022 20:57:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070068.outbound.protection.outlook.com [40.92.70.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E61A68B47B for ; Sun, 15 May 2022 20:57:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PJnSZL8lomPGnFACeUm0IkZ1CyxGj88Jr9YuWrfYCbXmf80sZURstHA0pwFqhVaQSY2ppDC/Izii+oOg52oSE3pPDuyafboJLlZfmvB3T8pI0rfedFRg61mDWWeTW9rOQ14JehgfuEk1cBCdJ51XC6TIFTqoi1kbgI+3yMe7VfgbgOiOISiYBH2njaq7Ju66oZeLHEKubJZZzu7Qg+FX5NsKuWHTUIOLHCin4m8a/ocs3VBlvYbQI8qEtG+s3oP/S/Ab8AD+ektFciDNwtBi7VZc1FL2S617zczNr0GHtlVvt0IPtwTe4Q8rWEGscVlcV053813E0D2Wc2jhI8wAlA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SoRXuSyrQKiAQQmsk8yAZK2N8iK0Mey9DKJULlyC7PE=; b=g+ZQoiULTMOXDgl1hP3qq8bDoT2SoibYCVi64lVQuRb4w/DD/fRSV8Po3EGWK/OfH8DbrzvgbAUj11fSIWHgvnhWuozwcl9pG9lhZxS71ZP6uzfHMy+7zqj/DLnrwmLcks6iaVGS4+wSi1IDb2GAtABK2HGt5eZx0o5i+WvfYXoLkDS/pQXEZDy7zOLN1iUNwD6lB8NnHad48BvfxmTQ07phmcOgpGGLMtfmfUXmLp9G3ZR7zFYdxQKxUwonQAESw6PtnUAxY7vD3huK1O7YMB1Zow3XMsfcORdpENY/S9ScZZDKg0Aj5WK/NeZZNrjp6+FWMmB0oczzFbbB40vXAw== 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=SoRXuSyrQKiAQQmsk8yAZK2N8iK0Mey9DKJULlyC7PE=; b=pDKrp0mmuwpBSYYa8iGcYnmRRfXzFcBkFdtB5gr+tfavZ4Efv5ALii7BZnoiqe8m+r7fd9Qz3g8nOeaVucY0ojniqt7N6ulXFEYJEd/I8l6kck6LLpaiQc5VWOh+qDfnWnfcLgXGhldmqBL3OzgmdlNNb1Pm58eGoZB0N8FrH/+VUqtzXSXtEzVnUtNRLWNRgOmJI0FfShC9cCBVUjFxkMby2cotmmbiHRKwSLcjOgITeahJHN9aROVJ4rbLkB+XRuWHCTsRvqjsBCp2TNWGeMrn0qcWz0GKIQAiWED1YnRbzFo/1yml0Lncn6F7MYiG9SIJmAR0OEfndjlr+E6Y6A== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM6PR01MB6102.eurprd01.prod.exchangelabs.com (2603:10a6:20b:fd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Sun, 15 May 2022 17:57:05 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5250.018; Sun, 15 May 2022 17:57:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 May 2022 19:56:56 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [5H7zz/1qowk0g358Xt+geNQq1YeLsXLc] X-ClientProxiedBy: ZR0P278CA0066.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220515175656.282889-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93db88f1-4363-46ee-2cc9-08da369c523c X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEvjYqehEB7DOSC1NM9YqO7unL84cA4mRPu73PPFgzL7i3GjBhkFWOsBZJzbEcVlowcmQXWEU61y73iDyEkxqr6sDnZek9LvNRpQ+AORDgfhuML0iWORLk7u9gnkESlQAeJA27bxPE8iY64kCsTCS4s2ECoXWReuDBz9kNUGuco8McLg3404gf0KjaTUS08P8zUkdEQ/Dp2gZh5pi6yviHuJ3fIDsAmX3vWivwcQwCOVRr9t+jRNMurBdDF+oesUpz1wF/bGPtlBnsSBM7hmv+SSa14ElMW0BGlHfHBoFue1bjsa6acn51pb/e3ccJFca1oPJ4LrMS0zksrKc4pDI0NZj42AtDX8yW5yjx1C9r4ydPyD9Xnfw2uDyHQ+yJwEf27dlT1spBenR9AFgba+9kEb3IdRLmhZwNnenEe6U9Gj2ASbMX50V8cndpIcep8siANt5pHK76PtvYGs9AuaWRx5as2O1BLrrbDkARVAQrKR5Pf8JWnkunRNXuC+Y+OrvzNRPzKPf3OWeldIh2eCTpr3Xv3OwDjgkQt9uvq9zVUgxrSGluiPt4/ab7QDPLA5ouaJyNijHKtUkCEXbUZW6w45zS1TJd8m8YacaubJ3uGZy4WH+3dhXbpqS81hOwxgRAbShE4TMog80GLl426YnNQlOjAlnG25NER9G9NituJjyOuaWZEPS331e1YWMDUHUqW87nuJtWC7Bqwsev2FIxKa/VIxAMFwU/NaOZTwGdYFh9jAcERCg3sAyYNFFKc7gURBholbzq02PIPq3duRHpvj X-MS-TrafficTypeDiagnostic: AM6PR01MB6102:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gV6EKrXSU8fXd71JXggyAw51iTeDEm4ZLsBcj/zppxciH4vN7JBm7WrOj4I4B7jzGWHrREynM/5FDWbseyvH66FQfELCPIN1JC8z0UQ57AN0Qp5a06QdIIeL28iNptaJ4QY/b5jDTxyjismk1C0Wb+nPJgofA3V0WNZkdTMukSFPz1sOJLYZAXH1QNEluz40ElUOkc2Laxy0Poc+QOAbIUu9lYqOF6x7re+fvQiN/M4lj8rN230+qGVjq6pDkPWh91O631j98PADF26/qyHymgIndmJ14KvrJO0Kmq70iKV9LMh6P35lWJ/nxpHC9HrmAvK2pI4kVHlojkVhehlVMYGwDdRtm7VklF/Ix7YEpnVrpLwQibm5ZuoO0dR7e2ubZ1DZbs+gF0lZDvZ7PhwnbCr7g+ahw00LgDmpKfRmRo5AP4l6HsD5OfZTT9kS2krDr5oMlgJTvWJvUoDOZ4Cn+NmZPiA30iCD0Zb0j2GJKbFByTHVJ9lb6plkMIBv53GMGnzaMcBGuhCIR1CpSXtxZA7D/85KneiAD3zwMKu53HzGdAtzjUvgQPnUTC8PDnGeKIGLzK6KISFE1EWY6j1nHw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iuStCn8de3ZLGMjkgOkxrEGC1pnKLLmKJK3dNNbK1CgOWZCYvINYqQaaI6iuHA6Z0xRUf1+3zfmKftPpHFQMbek3FsuVOhlyok+geGgSoOCnYs+pNXik+nOVVltl7F3+9yz8kHafwX42QbW0MLcCeu234a1siPtFhxt3QGo9imtgoiL+FORYz+G+65bMKrzNpD5493jpNeAcJKo+SrsKlKNRhrLSWxGNhO3I9RpErhdR/63gMPIpzYwBNQCcVxTw+azOt7waG28nkrrrQebVlNbeU+Dv0DhXLgZv4FlKz1MmCfs+gO63MldGxKe53ATxEi6JyWdEvw8zTYBntmk4sgO+BryyVw2gwFRArFjTJRakmkO/vm6H9bXJ0DocVRNYqaqhiK9JXVc3/z73OQy273UlYMSHb5gt5zENrrKf3M7PCUpf41J3Wb7jpDSxX+rAkTG8xYlIhVz2r2zTGuUVNTTPGMSJgcaQ9rH6EHfSCYs72ruZLGqLQKO5QSIr/TVa0QLqpwKlr4Uu9XIzxYiR+fmcXDOAnQuHhlKbBkUJcy6dK0SmLez4LnAE1LQSrFp5mnjVZbf2xGuaxVA7+ysvEXVVWyAWAfXQCodhFaDbFzpFhXpdOqfGQNwxznjx35IFeoBqViOxlzE4P5rdfn0T3fga73ETFB/Xlnpv4KqkGCnCVAq4xZ0mhg9uMY8cN5/OOT7f1TkIFh+l3wYr9QhmjvliROQPoFSapdLqd/ARFoOth6T0nkxfTdzyAnH7aVYTjIKDcfRrakT7KJQZeb/5jQ6aQ+J0sKYTGvAOvKi3eaHIRbzeqOx6pu9St25rd7yIzFunIkCzsmitzYzqetUU1VES73AVJmFQHCKJjySgycnICysNsc9Ql0FmVlOLcIvQ+C0nM2kRDCnXiaYdGRpa1oXA+hf0suJZcOjzKYy7rlZ5WhiH/0CGsL3JLalGc/8AdG92Ogsw28Gpxf7UjmA77TvyVEiCyLoGqq6cJCuYY+JMwb+VwCXEl8u1a5OUimu0/64sVws3Um8rqqw30C3Z+RgwHzOHKcbhv8uncHyXMyeyLCS3R8WJXwyNst7ilyEA5FzUNFJ9G8JBKxe8b8nsp7sIPBTnmal8wZ1ffDgwjj2NT8j+4my/aOhao0ziqWFXp87KvAVFeA8x05TkU8weSHTMMp8khzp9YCWT3zpT4RSzESqpc6lHbfygpYqvmiJ6eaKAme0HfIPSNawizUKQc93ajsFQhsW412aJqP3vHbLyZgNeCjTmobmP0/VMGycvVYvb4X9kl76P1MleWAPgDZLUtAi7pDLOLO8lz2yRfLXgA7o8lA+076Y4iRdaIAJ5jDz6SW3lFLusMxDt4Xc70U82mCgI1KcKtwZwf90jlXJpL/V29TKUBTeC/UxKvLa+CyhYF8OccsmSbWeX/NtZwa1nLrBFqVgQSNx14LxncT3/pRrfEJKRMhqahtxRdeJL X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93db88f1-4363-46ee-2cc9-08da369c523c X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2022 17:57:05.1632 (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: AM6PR01MB6102 Subject: [FFmpeg-devel] [PATCH] avformat/hls, dashdec: Don't use AV_OPT_FLAG_* in av_dict_set() 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: GefTuXius9VH av_dict_set() expects a different set of flags, namely the AV_DICT_* flags. Using AV_OPT_FLAG_DECODING_PARAM (or any AV_OPT_FLAG_*) ic av_dict_set() is therefore completely wrong and given that av_dict_set() just doesn't care about whether the string it receives has anything to do with a decoding parameter or not, it should just be removed without replacement. (The numerical value of AV_OPT_FLAG_DECODING_PARAM currently coincides with AV_DICT_IGNORE_SUFFIX. Given that the dictionaries we are dealing with here are always empty (i.e. NULL) before the calls to av_dict_set(), this flag changes nothing. It would be different if it were equal to one of the AV_DICT_DONT_STRDUP_* values.) Signed-off-by: Andreas Rheinhardt --- libavformat/dashdec.c | 2 +- libavformat/hls.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 0f66251354..63bf7e96a5 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1895,7 +1895,7 @@ static int reopen_demux_for_component(AVFormatContext *s, struct representation pls->ctx->io_open = nested_io_open; if (c->cenc_decryption_key) - av_dict_set(&in_fmt_opts, "decryption_key", c->cenc_decryption_key, AV_OPT_FLAG_DECODING_PARAM); + av_dict_set(&in_fmt_opts, "decryption_key", c->cenc_decryption_key, 0); // provide additional information from mpd if available ret = avformat_open_input(&pls->ctx, "", in_fmt, &in_fmt_opts); //pls->init_section->url diff --git a/libavformat/hls.c b/libavformat/hls.c index 38eb346405..8204f55df3 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2065,7 +2065,7 @@ static int hls_read_header(AVFormatContext *s) if (strstr(in_fmt->name, "mov")) { char key[33]; ff_data_to_hex(key, pls->key, sizeof(pls->key), 0); - av_dict_set(&options, "decryption_key", key, AV_OPT_FLAG_DECODING_PARAM); + av_dict_set(&options, "decryption_key", key, 0); } else if (!c->crypto_ctx.aes_ctx) { c->crypto_ctx.aes_ctx = av_aes_alloc(); if (!c->crypto_ctx.aes_ctx) {