From patchwork Mon Sep 13 13:53:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30218 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4021546iov; Mon, 13 Sep 2021 06:54:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDj4Ez+kV7oAx+C0buulZx//Kts9u4J/Ji7kmUgYnW2LqXwFnrF3h5FcO7kcK+WHPYGPhA X-Received: by 2002:a05:6402:21e6:: with SMTP id ce6mr13040201edb.153.1631541298374; Mon, 13 Sep 2021 06:54:58 -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 v4si7278302edq.329.2021.09.13.06.54.57; Mon, 13 Sep 2021 06:54:58 -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=mNe1uuli; 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 9828468AE5C; Mon, 13 Sep 2021 16:54:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069079.outbound.protection.outlook.com [40.92.69.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14F9868AE15 for ; Mon, 13 Sep 2021 16:54:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fz7PWLRlsJcHcwpVeN/X1W+RQLnuS05CRlsozQZJpvTI0LhZ+Rd4MdrcGLcmVNrA7wZWesi6mDApN/SZjXdRRSiYSZmMvKDcpC3M2hzozTnV2lunk03l4ubkQKpYPCdaYoV8+aTl8Po+eTw/0zmyz0n9kvAdZbOnjJheV6/lRS1e2FeI5k10AH35xckNOUvLW/5op9fL8Nwn/srjw49bFQ7FgrQLmZ6S/hIQaGtBgsuQmIcLqC1U/0C3BbwahmtI9sKPF0XFpDZsXNLbW7YULW2n14BFEfYcCeaYGeO/K/B9YpxhGb/FecqdHK8Xk3CkGb+13nweEAgWg1W+pfQX0g== 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=Ac2j/Z81eoOhuJn/yTWf8qX+Zs0oTO2QpRKR06HE9WU=; b=Et1ZIlnYr4nmVKGoLKCIfBwBfwn5E3V+a1RNTqGApgw5IDhTeRhIc6kAF3FUNOXQ6Xkl6upUrZhYotuYJ//lYlktAZMqF6Som09BIYDLEg5fkO6OmRLuPSKRpqD8NCWahmUTOiT24PrhxOWELs3d+g8GdVczwSrPGXMpDgpBrGxBYjyXKGQF5Rg9A7MPAHxLGDZJPx8yd5QaYRgS1kOPYqZ0GD+Adk9W9LshTEH6V6cEeSyvdHfU1I/dnokOlqB204IOo4aDbFf8hxbFmJJ4OvrfBnE1rfCxwUN0/6/upGm9TgZods+bFlAC6PT5gQ6fzIdDKu8hzWg2xZu8Id97aw== 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=Ac2j/Z81eoOhuJn/yTWf8qX+Zs0oTO2QpRKR06HE9WU=; b=mNe1uulihrtiy1/YhwOB1BASw1wybBStQH+KCRl1x5yVvT4Zgr7DISrjCv0vVXYUFZF1YYKCLNktZrTlRNuSNq8PsyWHpqM6yV0uvrams6HI2Z9aLN2hv4iAN1kocXZ+J+dYXZbwvp9D4tRRi13672jz9uKcFD6WQtYkN203vz22ovd/9D8AxZ3/Y8TpjwzKqDRQz52yJcPy0Hxw/fRSXcBPUFR4hDB4ghbOgqgNTxP/rsmLc9PrQLF+igqeeqtz5TGY9oG9xf5RnfDBGJp05TfQ0N0ARvksbDzwYJacJw66pfwGtwuq1YkE7nkJrAGNzEk8VklPRlFxuizMG6TfOQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6627.eurprd03.prod.outlook.com (2603:10a6:20b:1be::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Mon, 13 Sep 2021 13:54:03 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%4]) with mapi id 15.20.4500.018; Mon, 13 Sep 2021 13:54:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Sep 2021 15:53:34 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [+w/eq8FlOiB2VTm7sSy0/3JeBlokIIn6] X-ClientProxiedBy: AM4PR07CA0023.eurprd07.prod.outlook.com (2603:10a6:205:1::36) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913135336.2804405-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR07CA0023.eurprd07.prod.outlook.com (2603:10a6:205:1::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.8 via Frontend Transport; Mon, 13 Sep 2021 13:54:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6d77de5f-2fe3-4208-1d2c-08d976bdf255 X-MS-Exchange-SLBlob-MailProps: zswcL9HXbeV+/nHpyDOdbc6zZJeMBvuxauMyw4mXg3mtCQMlcaJgbNv2iFOFKA8fXPgbRUBWSHx2Qz1b+oR3NgSVaUMfhUXb4XVocheH90wfUXn/x3PhQX9MrXGbNbt/NQLbIjo90k6jRN45WNPcQQ/Dxk7dq8wRNAMYcFM3DRFDuqcAfcspbYLW6A4Up1KtkJ/RWI6/GxkwWZgH7gTNvOiDgcs7zp4wMs6WrHjpR+DV4gLq/DqIqxsZ+l1MyWCcp/9c/mSte35bJpJKTbjpm42lyn8iW9GlRGaptUparNUB5lkaQ6KekrbwIv9VwNgNJ2WUs3N9yq2uNuhNvwNBfM/YV/VILkfjcLiyIP7HzwKnWDS1y7K23Wji+puZLtbE/3DEkuBX8wA4N4i3tcchzsAPhI/gQoSDEUJlilaHpWhjE+/wd42rwcUi1NoXeQBIsRrkvA+mJ11PktToZ79PbHnLhxL1S+LZ06CwtGPz1C4KDGZLdrUWOuH/suHYhSHcatwAeTWA8PZafFAfnXX0HDf5aETt+N1RNyl4cO+19XoW5ENAbe9lcfW7soADOfXPC7k7GOnFa7kdpuy273kJwBSJjv6SwmQ81JTfihhChihFHgY9E7z/wzOTjRKpdb5eDndKPW7GR0ks7pIJTfvuOglRPT4xnVUKDVqGQwUgMmDQU5CijFNZSsOsVI4mLdDPp8ywGCN2JByR7kLuTqdw3ajO7owLf3XQNjp5VBTrl2BPwhAuVGpMZHZNWFSrz/jV X-MS-TrafficTypeDiagnostic: AM7PR03MB6627: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eO53IB7vs+BHB+fhSrMXHLiY+4daerKksLpauGwkLbmbyTNhtmtFpDdnzZlJmYaPe4CJfmR5T5WjpetJBQUNnyg7AJfceTMvQiqcd7CUFYgXRPbv8jtJSbBzzGO5nTw4uH1CUDVOaoBTMcJulAwMzPBA7cRnUCd4T6EDfqFROOJ0fq8e0pM/NsxQ0eTqm1I806APi3NsxSRz2UOhoLm+LXKO4TXQAo0Q7gtM2N6f4iZwq5/ULnz10icHuIUc0akNVNkCKk+NdVm1eWRWh8D16pJ/p0S59zRd/KT3mdJ6EhNyY/V4y4RMqfzXQ008+5eyZ1LRI78CJn1rVTmjBefmrMVnpvQAVAAl1AxGIwv4JI/twH1SzneOgRlafKQsVEorAxI67H7LHfR8zl3dUkunqrf2wN/Vkf05pFDmVAEX2qVf2dTuOffPcPR4voopP1vo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FSekA7rokMaQ38cQOxMfUuVNcQLEKTNfZ1sI64RlNBz2ROzCHxgeLJ1pkYnNXZqvyrJhYjJDWvx4SfIOQou7cYjNqIV3HEdoah9fWgrKoC3ZFiUTkLX7iXGmGFRrcYQRA2XpL0yL6u/Y+JMwK8t3OQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d77de5f-2fe3-4208-1d2c-08d976bdf255 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 13:54:03.8168 (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: AM7PR03MB6627 Subject: [FFmpeg-devel] [PATCH 08/10] avfilter/vf_subtitles, fftools/ffmpeg: Don't set sub_text_format 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: Soft Works , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: k/UZX/LfrQcs Unnecessary since 1f63665ca567fbc49fa80166d468a822c2999efa, because the value the option is set to coincides with the default value. Found-by: Soft Works Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg.c | 2 -- libavfilter/vf_subtitles.c | 1 - 2 files changed, 3 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index a9bb9d964d..4b6a6c7fa6 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2983,8 +2983,6 @@ FF_ENABLE_DEPRECATION_WARNINGS av_log(NULL, AV_LOG_WARNING, "Warning using DVB subtitles for filtering and output at the same time is not fully supported, also see -compute_edt [0|1]\n"); } - av_dict_set(&ist->decoder_opts, "sub_text_format", "ass", AV_DICT_DONT_OVERWRITE); - /* Useful for subtitles retiming by lavf (FIXME), skipping samples in * audio, and video decoders such as cuvid or mediacodec */ ist->dec_ctx->pkt_timebase = ist->st->time_base; diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index d0bafcd3cf..f08a7fba9d 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -395,7 +395,6 @@ static av_cold int init_subtitles(AVFilterContext *ctx) } if (ass->charenc) av_dict_set(&codec_opts, "sub_charenc", ass->charenc, 0); - av_dict_set(&codec_opts, "sub_text_format", "ass", 0); dec_ctx = avcodec_alloc_context3(dec); if (!dec_ctx) {