From patchwork Sun Feb 18 01:43:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46330 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp553364pzb; Sat, 17 Feb 2024 17:41:53 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW/pfy7LYD7Q8nH/QAZx+6zLiDxFB6a64l5SpASt/NNFtT54FhdgmSV/W4HMVqQo516jLKfVjK7uFK10AJej8WPtinmoki+fCdqHg== X-Google-Smtp-Source: AGHT+IGJSP0BPpXtO5yha1A86RMwkc5C3nOo28883pUeJbPnPXeFKIzVIEikEft2kgJV3xhOf4HM X-Received: by 2002:a17:906:319a:b0:a3c:fd0a:7d7 with SMTP id 26-20020a170906319a00b00a3cfd0a07d7mr4024250ejy.3.1708220513464; Sat, 17 Feb 2024 17:41:53 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jo9-20020a170906f6c900b00a3dd9319294si500626ejb.290.2024.02.17.17.41.53; Sat, 17 Feb 2024 17:41:53 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=DxAJDTTZ; 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 4597C68D322; Sun, 18 Feb 2024 03:41:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2097.outbound.protection.outlook.com [40.92.74.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6A2968D314 for ; Sun, 18 Feb 2024 03:41:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dfF3DqaYAvBStuS/vnDYPjPWtuUEcytiNa/Jr7v2T7cTLkM13nrTPWXxDVSJWXCVp2IQloj6E1JDN2/glvTH0DiYo8jYi/V3d8MyWc2aXFCjxNNP/AuksBlTyn7dNbXv3qn+CFigRVLbJ8axBY195DuksHALMd74c2UwH4XDywNnGeNT7ATP9WOwR+rzOe9mHmSze6Cup0lqY4YQ2HKgOOaWpjWYc4rAV5OHVORV4RvBlFBKyqtj67rMj+XQsheQ/ygk27N/X4SToa1diLUGwh9bQeEerIxtTOa9isDQIMpIrCGJFNbJ/bQynvTqvyUv0DcH4jJ56OrRH641Wj+vJw== 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=5I+cJWDnMuvp4jb3/EBx4jal83o68sJYAH4DU9BVg6k=; b=R31x0AwFVbLCrFxd+hkBwjsDLEJ1ml9bKJh4B4nLyfCehcJl5KlZvnw1NJIgY2Mt9Jf0SDjqgGnFOYKUhSakl3na/GYxFsX33tRLQrarB7OqESlpRr7ut6cZIfhJczyM1MfFz5HMSZvHnb4ZaLNdRKFe3Ki29R+6cd7Axb0azGsZHVRx6D/RspHfIvEmToV+xg49h0UI22RJyLLrByaFVijMUdwAKFO037OdGUq9N46YEOhIXs4pGzNvkjubtGE+HdpJfWCWAm+Uhs/kouQX7sBt5FHJpeI9rlZMIeDn/62qJ756udUAjWUmIflwBc8eVfrMYgxLCsWsdW6zmPeRhQ== 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=5I+cJWDnMuvp4jb3/EBx4jal83o68sJYAH4DU9BVg6k=; b=DxAJDTTZDGRiq31n/7h85VjPEFilrhE8hSKdd51xSWsvaYP1fsbZy/wOJ7on/fcttODdWl8OEZaxekNb8N/pHeWaOyc6VGw+XX3jd8jffbR0lQ1IxQMFgbaJvhw/Cv2QcfJB34ZR2BNUs0Gpb0h+IekmC38ub4jbXGBnBQDuuE7tjTBFLh/Je+erzvVFGa2DttJZN3zD0rfn367nomiQLaILnQzzZzBlRe+DnzB1pE6SsJTud97Oj0E3nhhQrRbrphoWxGDwTXCCbVDCGr4krLd026Mh85K7Wbc156ARfK7D3NEdEF0xR/Gw0FrKD826ofjg92k+7Ic9ZbP1BU7hBg== Received: from GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::7) by DU2P250MB0319.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.32; Sun, 18 Feb 2024 01:41:26 +0000 Received: from GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM ([fe80::ffe3:46c:6214:2504]) by GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM ([fe80::ffe3:46c:6214:2504%6]) with mapi id 15.20.7292.026; Sun, 18 Feb 2024 01:41:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Feb 2024 02:43:06 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [+C+Lx/86jJ5rx1tjqQdya26mS7JCdbwpoQlEymkvFFc=] X-ClientProxiedBy: FR3P281CA0033.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::12) To GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::7) X-Microsoft-Original-Message-ID: <20240218014308.2819410-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0063:EE_|DU2P250MB0319:EE_ X-MS-Office365-Filtering-Correlation-Id: 86dad592-bbc2-48d2-62fd-08dc3022b806 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bHzBLMDbwayTXyiXZDLV4bbSd9HKKXd562plkDeoi/AW9BZs57t6A5OqTDuBc6q8SGLmDQCqSeeXQW83rp40bwYBN7SIiyDMCkXWmW50C0xcYs5MILZCo98+bkZdcgY32ZVSkHRq6J5bZKy8feU869BgoKJEu0mKM6bN4Rp401WohwoMyjeKnCXhYB9HoxwnYYmM8yqT7YGEX2ZuXhUyhhCn5sYGAc3aHrGRm47L/yAX2Y0sUqi3nb/ROOhNfI2JVuKETqmCI5bDIkXCYwspH+9+FrYyhOudpcj9CNUBwX2QlhnwNhD9cMDKSSUhygBO2v2fHatJ2YuZ9OT3WsDFuUGpuAq65bqnIIYiyRqcfAsthx6OPjacJnatzHCQf7Tmygsd0Bd7XtpPhg5Kj0wYQRICsIaYWQACGoFix+0se92k30MPo6CLvOQytR5EmbW3pQTc7Cj3csH1HTSW3QsJkxBsYTZSxk/qelWwVO1ZiTMl+iXyfwDy+mox8FL8sbE5fHRtGkQO9kMpXCoS4LXzjeFfLxJrqWZoY9jO5WkD9tdQsjy1ihojLYFJ0UDmMsPBcxrYdyZyFa+11jdEzIsSW2Is5CHE7BAxBnvHKnWbQa6D+oT5oXVn5QGeCNABZSM4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 72aBTwZYNuSAT4ct5Uzq1AkpXVQaYtPuOUtw8SHy5pZcKT001a8ePPvbOwX3Fmw7RJbp42HoZEhjaOMmTb9VFioW/s8rlJG9y8+LrnK7kYu0ooE3wtgKVAQRAPfH2fIAI3gCHFTpfyB+OSPcSDJbb7qxSi/GzoxgMqTP0xpc0/EmyPoy7kwxLaydP8zaUw3m+SvCOE2W0o14rqKWtMrj8cuzaxqX35GVjRRyMEaV5vPVgeQfZzQjfti9RY1rTFFrKnwj6NxJ6pVtxFYO97ahJLvycwaYS1KS5UaRFGjxfVZjlQHSybLqyhAQE7uHzyItKh7IVvYUwkp416avt8lhf6Sa9hzqICr3D/Q08tRCljS1S8xpCIraMHhNiIVnNjRqnP0vCmOgDIv0YEnPv89TJ5DYHqJ27xUKcZTdNVNfFSlpC9RD9dTzexpM+ZLiZ2+zGdvg+z77+t16f38jElQb5K4R9JpMx+0KpjfNPE++o6ILcMnaEEqcEu90ukwYmRyx97cX5gK9c64g6kOUMxk9GKANaVUT2jshvO3LObRIIFvewmfnOEnmy5YhZT6ngZGnG4q2FY0NsDFl6A6v+7xYQ5bo7jxv3P6aUAND6+HD27xnamiGncL+IBT1WYOmbv85lRn2dt2aelAcr0oXruE7qHWF0NEjq2RWl/atHxb0yjpYxOlRUo5fcaKih3ES5IVZvYoU8uXVUtjX0vdizfcY5IuxuyaVkqxCwmDTPizYX+69WhSrh2td1RPs56erpQTE58W2Z+yveTF6DTyl1n5HXtHQlmk+IQ6Fn7f9zERbo1ONFa+Vdn9iXeB1VfdO8DUrdMSFsoXrXPvQyZqDTePjSTEN7NP26T07Oahz9mC5ky9zdpBrUquq69jCWjGSgqsGou0TBPH9E4vCyipJgq2yHZclhcOT4lVis4KUmL7MVpZ7Jmvs6aQwZqNJLV0km5cbPUwWrht0Cgbj0yLPB75Xr0pctYQf81wTAzRIoZPJDwLQ4Br/yX+LfHPvW7uTsnCb5NDUQLqkOn9yeKSVkveCIFh4uMNYmBdJZrd14qQfyenrV3Swes7OV8aI+8w0QNuNfn6QN+YDCt+AHUO09ZuT0rHTebvvw4Olma9MfSinQv0OAFr311ttTJ1YcMQ1H74nLNSTGsQWKAzTLLJZK1r6+evXZzswQoz/xKllWg7/qne9oKMyNzjGiy3GVfHutyT9LRvwlvJ+Y5EO+e4xyOqoHCYkbqdcLETI5+pmYBfr8Q3szLc1tXB1DRTEcT/hTApTBjG+3T7i1Ce6mlN6YdcqeA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86dad592-bbc2-48d2-62fd-08dc3022b806 X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2024 01:41:25.6053 (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: DU2P250MB0319 Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/ttmlenc: Remove always-true check 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: f3++OIgZG3Rk Signed-off-by: Andreas Rheinhardt --- libavcodec/ttmlenc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/ttmlenc.c b/libavcodec/ttmlenc.c index f48274d2ea..779cb75199 100644 --- a/libavcodec/ttmlenc.c +++ b/libavcodec/ttmlenc.c @@ -351,9 +351,8 @@ static int ttml_write_header_content(AVCodecContext *avctx) memcpy(avctx->extradata, TTMLENC_EXTRADATA_SIGNATURE, TTMLENC_EXTRADATA_SIGNATURE_SIZE); - if (additional_extradata_size) - memcpy(avctx->extradata + TTMLENC_EXTRADATA_SIGNATURE_SIZE, - s->buffer.str, additional_extradata_size); + memcpy(avctx->extradata + TTMLENC_EXTRADATA_SIGNATURE_SIZE, + s->buffer.str, additional_extradata_size); ret = 0; fail: