From patchwork Fri Oct 1 21:02:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30855 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2082944iob; Fri, 1 Oct 2021 14:02:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLZ5innuYWQj+7VXjbOYo2/2hVILT5/jRpj4+FMyxnqUcVc+3NJIW5/cYPmr5E1Jgm+XpQ X-Received: by 2002:a17:906:7c4:: with SMTP id m4mr35653ejc.553.1633122169996; Fri, 01 Oct 2021 14:02:49 -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 f4si1104055edt.163.2021.10.01.14.02.49; Fri, 01 Oct 2021 14:02:49 -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=p21LVVsh; 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 438EA68A784; Sat, 2 Oct 2021 00:02:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074031.outbound.protection.outlook.com [40.92.74.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AEE3368A75A for ; Sat, 2 Oct 2021 00:02:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g9uSTB/mNjgyp3yuHbpaOkUOHG4OqLpYUE26MswuxIHkhlbP7FaoLrAsmD/p5GlMVC3sN6USjuyY0Gn6IAwp5Mm2I6YHOxuebWFpBWp6mdyw62yzIywP+dxNeF+SBr/ff8ZyAoQcMtoBXvA8lJ1cP0y504qU8G/vW5lDlsQpbKyHRjYxc/kWLNmJtx7Cu2Jeqzz7GIWc71qfztk2bEqbUL+lhq2Ad8oI+ODKtRj7FhLqRGpabEgFd0xHymwoxDCk9tSznmzgtfknNKF5BdjgJXfaseLtAq38iNBX7uOXq3AdRhulFf3FhAt4Hh6dM3CBRZzLZaj2abCc2nkS0uijLA== 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=oq7MV7ETlyKI4M5YH74ZXzj6gvs3mtcQOXw3JMaTvhQ=; b=kEAeFSBR/ap6kQKgic/eburDCEn2DaSURlaiV3ylWAWY9aCKjfL+pWci5R5Mb81qrnChRCVQaeD9tRwnY93a8YqqmpsLDefQ5C2l9xffVZEvJ6QFmlr/zKuQTJgSlfWchM0Qn7YptADKSsrY40JCNrm+x9T9OUNOIgMswPs/7CT4J+lKdsaBUm1gv6oXKPoZFD31cnFAUc5mUxtV75ervV7ZnIAEo60CG04xIMDckeChhI97mel4kK6bxkub3FiFYR+aXDpTdhw+2/nHGLdrCdRwrkKIytGHJ6KT2f/PV5SJ0+4dIh8yTHHE4fL0PYOQADc0bOv5ewsAwxz10DDPmw== 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=oq7MV7ETlyKI4M5YH74ZXzj6gvs3mtcQOXw3JMaTvhQ=; b=p21LVVshcyyuU0zcFUeAnrjxKg3x2XVvdDLPfYHK9ZRSqWl+B6pJoEc5CeYnLbHf7I+MdvpyeEaCn2tTl3hA6o5Jmqq8YvPZnMIvlvIB/EUUe8EghH+7LLzrYTajl3cjvT4sL2oBlvl3T4YV42NNKcNbsn9hRiaHt6FpSDtQgCTkfuvNAIdUea24dZ/bHH4OkINF1DXRXPpwjewB/eon8DN1eB0b68mEXx6rgK7sJTn68pxGFva/Opri4v7OVGUTnAzjqj17Vqqfh18AMNJOq/X3CNUcFRoHdnxgzj1pyBWZRYs1d53gVRjtoFt+HdnYnUBKAcgMf2SYAmffIGCh2g== 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.4544.19; Fri, 1 Oct 2021 21:02:30 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:02:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:02:02 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [oAbykh/jGq9AmVA60Y/nDpfYVxi9Brza] X-ClientProxiedBy: AM8P189CA0003.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:218::8) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210221.2879117-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM8P189CA0003.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:218::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Fri, 1 Oct 2021 21:02:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8edf2c71-97c4-41b0-0389-08d9851ec805 X-MS-Exchange-SLBlob-MailProps: EpEO96k6WomtMq5UKPi+rl3ghKTkT8DVcl2uUApcISZrLs2frV02WFDSzOYMvTke9UjXB46Pxx4NaZcF4a63oscsuhCLL47HJyrcUrDDqxWbUuWwjqmSyBtqtQZrUM9DwrxH0v42jU2bmVXs6qJEr6YSHm3Fpu8MQBgMoQfLfptwS09M23FLsmJN6dd/aE38hi6C9FxaQ+vPZ9/sdgqA68Puz8Obd3FrGl0vq4R9EPLPXluCfLQAlkawBD4pSyqWZ3eCgII9klvlTg4hN9N6JBDXG1Uo2EpPvgDnmZmq7eDakR3uHgqswnPCDcIrFLk0Vh0huohHqUgdyvxmcxtzZW9I9Qy0arye7LY9vyZgkBoi4VxG06KZl3vZPpvZwMjVn1i/gejYn4POoLtYJpHe/iwDpe4tq/liw316dg7ebzI1PcCWGGsqbcPm0G8s5PgUqaHemaWhYMa8hpxLz6N+nj5xGNR3EVcbWwEoBAcFBx8IDo0dLTQeZ5EW8822PepbN4DBhVIFUTFwPp0RYa3EBthqZaSvlMYe2WaRqT6QObTVV/5471hP9xna2eo2hw8vJ5HMYmrXIhD049teg/u381whiTVy/Xlb05vhsbhrw4BZOJFdzTXN4NYwsmGvD5dtMPDEYfK7ObjxQ2g0FThrP3arq8/F4dmF4KxMNeMaS6uLbq3HuegOk6+lEcfZBW8IYHEJX8RETG4Iv7/hR2tUFFn1D3KPTXZ7/D5InJs9nnhpJJT+HyqtsfGLUrMKjK0eofBP7gNZ/dg= X-MS-TrafficTypeDiagnostic: AM5PR03MB3009: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2FyPb80d9fjfNjDzHQTYcBzQOeYG+YYMWUMpGqB+DUoiDzqrmUOUiNVgw8BkId32PH6GVJBHuqGNoSvA+Phx+cJsPMZldX/GXLyWmhrejZ4tf69Sp2yOQFVOFog0rKPuce5nlIA3FD9Qg+DSOK0ulNW9WC1OfQOrozrec7fu8RPGuVhe+4TS+Yj0bT8Q8yWYM/FnzUQgFL2IYKxEP0EfzLaxKs2opUZq0qaUAakIs+uEh4244y0kJ9BuG3p8dRZCNfUsFSpnRcWk/lYENGXbkH2p5/EtiMJjf49iQb+0rqXsiga9acsfahDRutprk/0Eoy4/GicxJTK8Dy7FxkwkW2naxgSSMb7zSKV+eh/112gQeUG7GlUMgi1sKYqrrncIPZzoCBWVmjPAB+ZuDGsW/v+Gg/3A2Vtyypdjj4AToT+lHgeKoYtZj40tP1Lwfyuq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1QhD+zpDTK8WIRizvcSbul3cUJ45LVXsT1HvQQlb4AjT9oXdRjTzxWJDqHWH+Ayxlap+OYKny6Kl2eN2w5VUFnFmddfVrlGuN2pgifrDGQPNVY0sGOmvJo1QJFC4gWdgl2D4wtjWNY1HfgpZFTsi8A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8edf2c71-97c4-41b0-0389-08d9851ec805 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:02:30.3429 (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/20] libpostproc/postprocess_template: Don't reimplement FFSWAP 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: BgGYRG0uBF05 Signed-off-by: Andreas Rheinhardt --- libpostproc/postprocess_template.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c index 411fc41915..9f76b7c587 100644 --- a/libpostproc/postprocess_template.c +++ b/libpostproc/postprocess_template.c @@ -3595,7 +3595,6 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ for(x = startx, qp_index=0; x < endx; x+=BLOCK_SIZE, qp_index++){ const int stride= dstStride; - av_unused uint8_t *tmpXchg; c.QP = c.QP_block[qp_index]; c.nonBQP = c.nonBQP_block[qp_index]; c.pQPb = c.pQPb_block[qp_index]; @@ -3668,9 +3667,7 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ srcBlock+=8; #if TEMPLATE_PP_MMX - tmpXchg= tempBlock1; - tempBlock1= tempBlock2; - tempBlock2 = tmpXchg; + FFSWAP(uint8_t *, tempBlock1, tempBlock2); #endif } } From patchwork Fri Oct 1 21:08:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30860 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2087673iob; Fri, 1 Oct 2021 14:08:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyRI435WiyllJYELo7OfCBeQASDTXUfec1ecL7IkV9g06eWU3BfWf3c+GgTiikWKRR57ZG X-Received: by 2002:a17:906:5282:: with SMTP id c2mr153364ejm.162.1633122536340; Fri, 01 Oct 2021 14:08:56 -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 q22si9111894edc.18.2021.10.01.14.08.55; Fri, 01 Oct 2021 14:08:56 -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=KTKmeQJ7; 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 0164968A6A3; Sat, 2 Oct 2021 00:08:53 +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-oln040092067032.outbound.protection.outlook.com [40.92.67.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E95868A6A3 for ; Sat, 2 Oct 2021 00:08:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m3zkuTtH/R5qEtvxjkT0dtD2LOcUzi6O24BuwdqHCK0bryezjTd6lb1AjeZbQGY7ge5GW5/gHWKUw1DurdGfgt2NKH/qYBtgBrYhGKHViL21vZtZQzYHV/lSNnYOEquiM9VrhaIQZyDa2s08WRSPbpbAzC2CsecaIdn4c4kFmhiBHR8DOIWdXpMclJBv8YUcCSGlH3VqXe2mY9GIHEZAze5Dnpw8+8l7Z3vAD6u3Ikai7FAaMN8Lx/0f3ArRugiQ+I5Y8dqnEOt74IFdlEd7WeX+mT0nFCJxYpGjj+fq4EF0/0FGBQmqoKl/tVH9Nau7A8aTVwCjFNZhkficbUOZDg== 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=nfbySjBukbH5ppBoBJS0rxfVHxGjcnBmiIycAje364Q=; b=m0xZuWBmqpWxJV2/ZMF/AbgiHzs+XLU5G8xCnNXx7JJiI0BOYH71+bd/Iyln67rbihpEVGyhgoYq+U4hd1FJxCUId97+5tqUybomP5wzFXmUachpy71h7P0NY1DZXSQFPiqMv82uuKCt9oreN9cznLDwFL2L+o9my8PEkccgy+w41FD+1vlkchcGWExGEr+BP3lz5FC7J7SOKtNVwVYmktibCYXmsDTMPwK0dK87eUzuiq2b5wmCh1EStq8lx7vPGMot4MyI/X9EuG7+dHqCWGMOxhUpp4UoGY+4Ud5WsTrRtNuSWE0tsTCZc3/RAdNybOSxYg2BZ/yy1DeLbFtvoQ== 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=nfbySjBukbH5ppBoBJS0rxfVHxGjcnBmiIycAje364Q=; b=KTKmeQJ78yH/8z1UeBvfZcHHt75tAak2RMLRYyvCqK0DaQy1fFjVbJr7FgWftAHjqvNf0tf0hPDU7fVBMnnvL3YjpodYH3qstdBFlXwSKzV2gLvdXv8P+CnxIQhwAbdpzDkcHC/35N9mp7dsI3kp2TDPbRrq0DQoMCDc37VOBBNq8xTHAOtIDyZtD7EsqBOgO1PU1y5a+bOJhVU2ChUnqFAZ8zq3crMxApG0bkEScw2U+mJa7BEEHllAbT6dVagffMWAqUyTWxUYiM5i7dGGPByLN4qnaWBO45HB+WOfqZRvCvibDwJKuhkib8lZnjtkpS8RAGMCZiAHZ7tGk9slKA== 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.4544.19; Fri, 1 Oct 2021 21:08:45 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:08:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:19 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [jC4LYEP+5eC+fcXreXzwS0a3Ilr4nE0v] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:08:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 979df967-18af-412e-63bc-08d9851fa7c6 X-MS-Exchange-SLBlob-MailProps: EpEO96k6WomtMq5UKPi+rl3ghKTkT8DVVBhYoo12VyNY2RLbjIvoK0Wu/rj8ULL9fNDQOYNWk0EJsn4UtQi0ZWC5FTA8XLQfUOualnGqoLGtNdtszlAKnjUxyLC+8kkVqkgMlF4Ccn9hxrYALdYrwa43OqOpdyw6nTJiGq3D2/mOaR0I4IZTS+nAEheF92MNUsU42819opos7UlaoROkSJzBv2PkFiWOi9cs3nAL1hpB8seg+fl/mLje8sApTIAfNDyk4rVd0g7ILQuzA+m8fZrotiDRPk0iOqIAW+mgK8pIHwpIrlnK6Hk3U/T87a74vDihGQ4Ptf4xG/VedVU36hJDteTjMkpyLBs8yibzt61JVrOXFDpimMKsgflrYVuazQr0ZrAhcgObz6+yRw1+Uw+eeBLQVbe6hGDvpMrA079aAfisFYHujp/Nk9E2bJo4KeLXCtHo5N7SOskU6RUg+DUQ72u+qSSH+3BMoXHq3pvYXJWeH0LLKq1f6FBFBM6bHCFhOltlzytXkQy8oh5hfeYqBKgIN6Kot/f821yFblmHToFaPCnP3IhKzyyPmVLhspmeIsug6I2+BmJW0jteWz3ECdaVWLCmbvwXUHFWo9JE9bzpyCLzPxxdwQLrgL32z9QYh/tW/bIOxJbTxtuTVudDkap/WPo7b6TURj+TF3+BTvFoscJbt5hDqJm0oBuhrYwNBg6uNL8BUT95qFHM50jWVLqryDS12JSII3MB8wG+f/o9joxKFcbK2t16qBdREZSajUbjDOI= X-MS-TrafficTypeDiagnostic: AM5PR03MB3009: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wKu9OVQAPhhvVI6GAVuY4+TKXwKWFU27K1/fxZX1ZWuOowdm4kqS5zcEQVfpvyrgCRuZTLM8pVZ7wFBUijT18elZ5jGbFpmeS2DL8fMYfEh0IlqdqiVvEpDzQqvIJUcrpJvtjzPnSwwXVsTYoZsxWQJQaFBkoLygWpiZUFuLROkaqfSVkOKoAAQYgnShyTCLpgDBmX/quiHY/cqoOZvVzU/D/T6vg5wC+s3vazvdvTwCgwkJzhAuktqQfehbFj/lmvzioOc2qewlEN6mnp45nrJ6XK3N72KgUArDGsSYIdF5OfHBl3IRUmDYfzrlfhQ0RLoP5Ig8cdAFX6EYNeZXkbHTca74+vcUh6D9trg4bvDMtUSU76zI4O0N/lKpVmBEBz8XOn5hDG6HVJUd4t6ItsgVMWHzVipGNCjhVR/HTmfhzBTeOM0/sUTqS6DfzByx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VZz0dOPgtfmKGwWgId9gBwmE9fqYebKh8IlnRl3YW+GvAdtxP0yh8NI3NkjGHAH/8vY8JTXab8z6ipUzjgRqJ8mtXC5oWDgPVb8/fmIZCC2zpvKI96bgymJ0yIsh47V2WygE8GdvqSFfQl44h/4tUQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 979df967-18af-412e-63bc-08d9851fa7c6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:08:45.8059 (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 02/20] avcodec/mpegaudiodec_template: Remove unused variable 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: T69ARX67FXsj Unused since 9ab0874ea8b6774c6f5470dba2b5b4615a610d0d. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegaudiodec_template.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 4fd9e3a690..bbb6ff1120 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -1638,7 +1638,6 @@ static int decode_frame_adu(AVCodecContext *avctx, void *data, MPADecodeContext *s = avctx->priv_data; uint32_t header; int len, ret; - int av_unused out_size; len = buf_size; From patchwork Fri Oct 1 21:08:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30880 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2087788iob; Fri, 1 Oct 2021 14:09:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjyB76jbVLjN/vO50ayrWg/dzes97WesJoVAHxQYnlpcITvBhtZEpNmpFiQOIno2RCvYyb X-Received: by 2002:a17:906:169a:: with SMTP id s26mr134497ejd.278.1633122545515; Fri, 01 Oct 2021 14:09:05 -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 f14si8337939ejj.667.2021.10.01.14.09.05; Fri, 01 Oct 2021 14:09:05 -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=BURZjc9p; 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 065AD68A764; Sat, 2 Oct 2021 00:08:58 +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-oln040092067032.outbound.protection.outlook.com [40.92.67.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5649D68A883 for ; Sat, 2 Oct 2021 00:08:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BzuUw3VDUFwSkNpT4cBMTGwNfE9qrGKENFGKtAqDoCN/7O7hV8qpPuiJoZOVt70jis5iDI/0/LUx8HcDZyYb0PLrkN+zE8kwY4aXzwxtGrSrHNBnuJCOQIViLyIuBQAbpQy0AOobtGzl4eVNeJLWcpIiNKZjL3XaMCct6M1OJLDIKNvFeoXNgxC6iRZvX1yyma9+4dKtlL7BWXRTmLkelMb7WevHdPkAyVcxQSH5E1gJ2SBNgVkjqjVcjHQ0C9BGJu73eZunhYNM6+X/kGohwu9RR176KtG873mLr5cWLE4D5UsvTCG7rxxtv66bJJbbRZ0JHVZNImPezR+P7v+7LA== 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=Igyz+13buzklZ0JYucRjzxFSPGUVE/xJQziTD+4YTxg=; b=GbJM7qYTw/WzoaX76zn3iPyI9Wlb6l2YcM3FWf5s0Vnp+bVDjs+EQ8l1e5LCXxMPt6NgpfZs7WCJXYUrWkbN5aXfWnh6hi4S2x6sPUocPwnzvZPHq+yS1phKo0WwzjUDzloneRI+yFpIwGrf6/HBAtKpfhZgP2RTESoILsA3YcPBsPE75sXPxilMzDg+hqHo8tRE4YlhTB4NOwmqQsXceFvTEabAv1RdyO/U0CC3sQYd2VRR+0cOiLO3bDtKWu+cHo792bXyILuk6IV0rZm0DaNtfyFneMeqR1/laBYx53qJC/s8Xl74SygrHIIn3VyDbk4d0aYI4M2gNmvZ62b1jg== 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=Igyz+13buzklZ0JYucRjzxFSPGUVE/xJQziTD+4YTxg=; b=BURZjc9pIPLhfFlgbgj+uToE6mAzQhqFm5LGRotaQdYsGfllojv/2kQ9od7LniVMlPa5PY/lgK6vQLQF2HcLhf8My3WHYcSw1fjG+ZqFw2unqlSpnlitSVh3vOapgzf+tn7dt7xlIYS6JYMx2BeCx+oEmoT0rbkjYx4i3gEKvQMl9Asss7DLnQuySVLZQZikVXxzBAh6FJzra+HzUgUX7+Op31D0YAOkYPnQ+bZ1CkMYs3jGL+y3sdBY8zM39MtjkY0PysvsCGXJf4tfo2M+7nIL+Tu4oITki2Z8apYlk2IGnjmr5oOBy5jV6rhooh5O50CCw63odsTqr6WEg86MEw== 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.4544.19; Fri, 1 Oct 2021 21:08:48 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:08:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:20 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [moCI/4Tju7rqhdqcwyRI60GkMFqCb2cZ] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:08:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 82c770da-35be-462e-4f0c-08d9851fa982 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVM2asYY12qjM1/Eg4mHSQysLs1FtwQm1ZYy5iKYa6quvt1mosqDj/9he3aAuz0H9LIEDcZMm85fASa9sZO37ebya4yJ2BNdHWjwPsHfQbcc+Bw6cHo9TlhHyu28WWPf2Vthgeu6KvE7JIzrcftYdQmQhynZbyddv6u8KR8fLrPPE44iA5a3wrCTVLEvChJEjnuu5SyOmZmf3gnzMUdo93cf53lT6Km3XvpsQumroNS7U2KIjZetX8JqJIVB66zM5+buhj8hgT4NaCEyQemGtcsYjYWfS7SIz7Iiel2QZxC3ZpFjSGlDmoq3WwPbIrzJK7ma9oz24w6PmlefJ/Qbbes4zGPhhsSiIBwW1sYbEyCFClMbyNL3vgPe/nY6c59xMIK/pTSMWHucIEgO/XHdET2uu27wjY0pXCNInTF3scH0qDo/ikvd5bjX83L8P52NAJD6hG+C5/fm8eiJw7LCiXrUXTjbnoWIeeezFIBwxpBWEsEG56KwF4xnaxzKMlG4IhjS6evTkyUqRT0y/hKfxy4hCz47kCJ6/v1NVIM3+eKWwxgmMslX1PUN4N4M4Cuss3J6JKC+tdqPIGahScdNj+EcTQ9znEo8fEMYLyHj0IdiGCtnWDdOzFqdTNESvJSPYJCi+p/M/nfntAEZergn+XajXzFQPs70gkIs8KyvYUisXVicO5hMrG0HmrzNAFZ1ZPME4UnfNarHrQMtB/RuzLdRnr9jf3Jyv4= X-MS-TrafficTypeDiagnostic: AM5PR03MB3009: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xXOF1A6T1PanqwJerQ2UtAoxNT778D8igyvSVcs75Tp5RDFaj/gjcjAaFIKw9grBhKlvHq1ukcfoSc3ISSzEnbHxTsvmegLLW+nBMw+Oxy0owp0SzEVqFfPD1RV5cmu3jFi9dzB4rF1r5vvyvwuUgY9ngQzbPpWO2gZbvDi17C2Fg8XaV/5PxFMYGxDV6lV3EAUIGpfilIt7P8zb65v0hSl5iPcK5wPB819LlmswnO3lakIZ7Qa50jimWSE6f1LFA+HGMHk2eVwgKl3gyz7ZC2BKPjKep6evwAIG+mW9UUgWDdeJNakyObIHkVbz0oJb3hn+bZxOOCcPZ5LO/mxkbFPCBfo6fKm3DydLLVztnYVZ0yIhG98Y5pY4QgQm7Bk5IUfnrN2qUT4p6Ypl7pQiQT2TtDPbhb1vToBOkJ32K/OsSEoeMfqt0C0v3d4khWb9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0cQWGF/0G4Ifod48zTX0i7UYFEN1Sa/zpOgxZpZ7Xvvobu5XAntgmt3mO/21Wi7SCht//TAlgqN36reUmeOD/GyPdZOKIUdqh0K2kUW7XMOjFNMgceNXe+4E+sdloUZjnxuLeRiBQZ5gxI5cKSOU1w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82c770da-35be-462e-4f0c-08d9851fa982 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:08:48.6345 (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 03/20] avutil/md5: Avoid av_unused variable 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: lVKu4272Uthl Signed-off-by: Andreas Rheinhardt --- libavutil/md5.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavutil/md5.c b/libavutil/md5.c index 88596203c1..0170d8dd3f 100644 --- a/libavutil/md5.c +++ b/libavutil/md5.c @@ -100,7 +100,6 @@ static const uint32_t T[64] = { // T[i]= fabs(sin(i+1)<<32) static void body(uint32_t ABCD[4], const uint8_t *src, size_t nblocks) { - int i av_unused; const uint32_t *X; uint32_t a, b, c, d, t; @@ -113,7 +112,7 @@ static void body(uint32_t ABCD[4], const uint8_t *src, size_t nblocks) X = (const uint32_t *)src + n * 16; #if CONFIG_SMALL - for (i = 0; i < 64; i++) { + for (int i = 0; i < 64; i++) { CORE(i, a, b, c, d); t = d; d = c; From patchwork Fri Oct 1 21:08:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30868 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2087919iob; Fri, 1 Oct 2021 14:09:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUyxnhDTJ6jT/mYYYc1s45ym23qkIo6Jv4wCswubyN/bkRAkDj5rlbhJpqMxGcAUlebbnH X-Received: by 2002:a17:906:5051:: with SMTP id e17mr75793ejk.481.1633122555541; Fri, 01 Oct 2021 14:09:15 -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 w13si9040530edd.112.2021.10.01.14.09.15; Fri, 01 Oct 2021 14:09:15 -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=koxhek6v; 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 0A2BE68A8C7; Sat, 2 Oct 2021 00:09:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068011.outbound.protection.outlook.com [40.92.68.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABA4B68A6F6 for ; Sat, 2 Oct 2021 00:08:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jLMnX4qzH37VE0iwX8yCfpGZ1r439qWkK1H+Hm52P1Pvt1UaDwCb6t4zGSIhB5pcm5CQ4VapSZ6Tb5/nEsROY8BjbjWwXmP9VjQyCOGipLcmMYWaQJMgW5yAnWI07tzwT0MCPrCsMqr/7Mo8+dA/AmB/P0CShFXLERDMz1OVx9QvI5unBPQVlAh5ZQCp7aBxYaxZxeFSFGrMzNug8IIJKUGYLlpZFj10uqBJgAqZ8owiqno4JiQoFM8n0c6FJ6Cvxpc+UyrhuJoLsc1nPesob4GZB1bF8ul0M9hd4CYz3GLm2UOQmt806F3gg07hqgRUD0DG0Zv2xf55TPQdCqBcUA== 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=veZG++pB51fsdJyfyXigHAAIeRGD7kBccO8NDEXkJW8=; b=kHuQ1WZVdHNeHIS2lYXmyN4u3Lr8ueblNOA+qVg+JxylaVdZkNfQ0NCDd8jRGRmPpJ8/CeY5Z71m9CCUna3vtS5Nkkyp9xnUQivi7F0e5K6mmN3/WYJWfuLmi6TIUHVxZztv68OeqPwFzlMU9TmEJcmBdAo6ntxPBhKc2PeqIOQY9S0Mb2rCAbNXMt1Y79o1ckJnFoaPrvCdN2zpiEJRkIVxzjpq6hlP+BIqjOFjf3qIqo35PAzt/1ORJFjEKMbo7O4G5/XmWedThlmIu2L+sWOzSIrhevS02csf1WITHL1M5xXE+1oX6/xUAT5XuusR0BhCxgW0DNxqogWiLRfNHA== 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=veZG++pB51fsdJyfyXigHAAIeRGD7kBccO8NDEXkJW8=; b=koxhek6v1Q3H/Bqo2v0ZlW/oCriecRqx6nElpXRBN++3/0hneI9jDl9jqXgFG/yVJRw2Ld67aLHyoK8puXbmm8wAij11kv1wpGXsilgQ9aSpWlmmazfd1vQy8Uanq5kzjjRwzw/Dag5VQ8igRFs995ZWdy+7k50hnawRMFH9YxlnHGq70vTnNIqgGiyV70VZrVL0dGb5YhZq5FHZ524X/DYvdaIhkFE8RPSo6XFG7ukhbp+cn/rDx7qkOqGmql9KQKIbzEYjJh/tevxRVxGR//yQvcDdr++2x+CSwH6UGo836rrfuFXWaZIx9Hi4DWf1gatMr6d3E2zwoyAe9dUd5g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:08:57 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:08:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:21 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [loJK26l3lvMWsZqQbrEDK2DfrBMwpxxB] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:08:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0170bb56-f129-4751-363d-08d9851faee1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTgZdhvd8QKnLjC/Dfe6SG9xkgwbT+8VkHZNOozDUNiX+q+lQ0AKIEt0Vt8hk38aC+RL6Ua/30oZvpYBUDCwBASGc8pwnuEj4OuEKBAIYv6sy2+ngHX1igCaF9x7gehU1ZnFdH6tN+pS47SeefSD5UY0QzyxYnOAJ2ZiMQof7uf9XpJsjUnSyZ99qbsm74i12+9GrfhNRkPNsSbZHCfdLfdz3tzESSYr5RdH7t5k1LOPe1SmSH+ZsSX3fuwzsBRsjdx9wCQdoGTQLIniuy/w9x6BT4MFp4K9Pn5yPTBm3WedbtfWb/HTI7xzlJAZNgSxVkTpVUC+Vv7yInOqex2xEKGergbcO+cNv5dTI8gP53+s4VS8oe0I76Sq6VAJPrgbm1lLam9BYu2dLMsjpnQRE0VQkYiFE/odUjguVRXNaDnRNVWjEFOuRiJA67H2C9j7t9EVIdtc1ZJZGm3Ac7zF+qhIjorKyPoFAT4HY9u+iPH96zhDx5f5UsCf1hqqlQ5hVvo0elDnf8tGPmyBRoDG//9XvFFsDiI/1WStgkMO6YeNGICeo1TRYT02TXQSvYweF3UQhs51lgVLYy72y1YHV5/pWffo1SGRxO5ndiK4Mj5ATunkrbDwcs+XbpK+rkCUuyWQk/xIBfv4AaJPmnq5HJJoz/ZB0AA+l4AStrKVZ5PPV1BNomN3zMGaTtc0vgEoGRtPjRWP3vxxvl/6cZ208Rf2QpIWrHK5wZzsl7LaANafP6vuycVHp2iBtaoRjn4v1o= X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 49AwIhhq1lFy8t+a/esXdBpy9BFSWWW1pWUiKpj3hEFXuIgNkSZ6Y6iG8z5n7dKagjYLvfi1jkQLW4opwtKhSiNFrWi+xk9k4p9zJeBpQyf2tbm2jjlHLwOjEi8BoQOh601DoCozrrSULh6+Ez2BhuSYs94zl9Z46+zFcb4hslayx20dhrG1QrujgAf05P8OGDzhX+wd4puA8oxcX94Cw8HatUoqZyhwRJHiuewx9moh1nD6pBgFpmwnD+LG1LeorgD5cyIzEITPrVr3INzmWk+gm800NaVQtiFBGqc9rm3XoZUFzb3nfR1HyckUs1h8Q7eo8+7xEQ46LDesF+J+t1uc/raFHr2QwOTS/g7tXLpiPicf3+tHHPYxR6idoWyhgsl17IY7d743bGrSJ5PI5tXw+z5ZGH4dHJ9WCmVlV1M9B0HPj5Ni62MQALROR8Ad X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4NKs8oWHD32SUCI2AOkDtPibxYiGbCUyrbYEqi9yNljMeXUw0JpCbD6Jm949LXMALC46I7yrbsTS9FElORYFGqq8h3rnozpiZcYauPXi1XGAAEl9LtTfNO6MP3BYbj0zcPpTCYwDZD1XkdqiznN0jA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0170bb56-f129-4751-363d-08d9851faee1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:08:57.5923 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 04/20] avcodec/vc1_pred: Remove unused function parameter 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: 0TIJ2JCFgd6t Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1_block.c | 36 ++++++++++++++++++------------------ libavcodec/vc1_pred.c | 2 +- libavcodec/vc1_pred.h | 3 +-- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index b6ace37658..c922efe4c8 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -1642,7 +1642,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) dmv_x = dmv_y = 0; if (mvbp & (8 >> i)) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); - ff_vc1_pred_mv_intfr(v, i, dmv_x, dmv_y, 0, v->range_x, v->range_y, v->mb_type[0], 0); + ff_vc1_pred_mv_intfr(v, i, dmv_x, dmv_y, 0, v->range_x, v->range_y, 0); ff_vc1_mc_4mv_luma(v, i, 0, 0); } ff_vc1_mc_4mv_chroma4(v, 0, 0, 0); @@ -1652,14 +1652,14 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) if (mvbp & 2) { get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); } - ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], 0); + ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 2, v->range_x, v->range_y, 0); ff_vc1_mc_4mv_luma(v, 0, 0, 0); ff_vc1_mc_4mv_luma(v, 1, 0, 0); dmv_x = dmv_y = 0; if (mvbp & 1) { get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); } - ff_vc1_pred_mv_intfr(v, 2, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], 0); + ff_vc1_pred_mv_intfr(v, 2, dmv_x, dmv_y, 2, v->range_x, v->range_y, 0); ff_vc1_mc_4mv_luma(v, 2, 0, 0); ff_vc1_mc_4mv_luma(v, 3, 0, 0); ff_vc1_mc_4mv_chroma4(v, 0, 0, 0); @@ -1669,7 +1669,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) if (mvbp) { get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); } - ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], 0); + ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, 0); ff_vc1_mc_1mv(v, 0); } if (cbp) @@ -1711,7 +1711,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) v->blk_mv_type[s->block_index[1]] = 0; v->blk_mv_type[s->block_index[2]] = 0; v->blk_mv_type[s->block_index[3]] = 0; - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0], 0); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, 0); ff_vc1_mc_1mv(v, 0); v->fieldtx_plane[mb_pos] = 0; } @@ -2362,7 +2362,7 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) if (val) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); j = i > 1 ? 2 : 0; - ff_vc1_pred_mv_intfr(v, j, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], dir); + ff_vc1_pred_mv_intfr(v, j, dmv_x, dmv_y, 2, v->range_x, v->range_y, dir); ff_vc1_mc_4mv_luma(v, j, dir, dir); ff_vc1_mc_4mv_luma(v, j+1, dir, dir); } @@ -2375,14 +2375,14 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) if (mvbp & 2) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); - ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], 0); + ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, 0); ff_vc1_mc_1mv(v, 0); dmv_x = dmv_y = 0; if (mvbp & 1) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); - ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], 1); + ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, 1); ff_vc1_interp_mc(v); } else if (twomv) { dir = bmvtype == BMV_TYPE_BACKWARD; @@ -2393,12 +2393,12 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) dmv_x = dmv_y = 0; if (mvbp & 2) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); - ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], dir); + ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 2, v->range_x, v->range_y, dir); dmv_x = dmv_y = 0; if (mvbp & 1) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); - ff_vc1_pred_mv_intfr(v, 2, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], dir2); + ff_vc1_pred_mv_intfr(v, 2, dmv_x, dmv_y, 2, v->range_x, v->range_y, dir2); if (mvsw) { for (i = 0; i < 2; i++) { @@ -2408,8 +2408,8 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) s->mv[dir2][i+2][1] = s->mv[dir2][i][1] = s->current_picture.motion_val[dir2][s->block_index[i]][1] = s->current_picture.motion_val[dir2][s->block_index[i+2]][1]; } } else { - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, v->mb_type[0], !dir); - ff_vc1_pred_mv_intfr(v, 2, 0, 0, 2, v->range_x, v->range_y, v->mb_type[0], !dir); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, !dir); + ff_vc1_pred_mv_intfr(v, 2, 0, 0, 2, v->range_x, v->range_y, !dir); } ff_vc1_mc_4mv_luma(v, 0, dir, 0); @@ -2425,12 +2425,12 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) if (mvbp) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); - ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], dir); + ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, dir); v->blk_mv_type[s->block_index[0]] = 1; v->blk_mv_type[s->block_index[1]] = 1; v->blk_mv_type[s->block_index[2]] = 1; v->blk_mv_type[s->block_index[3]] = 1; - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, 0, !dir); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, !dir); for (i = 0; i < 2; i++) { s->mv[!dir][i+2][0] = s->mv[!dir][i][0] = s->current_picture.motion_val[!dir][s->block_index[i+2]][0] = s->current_picture.motion_val[!dir][s->block_index[i]][0]; s->mv[!dir][i+2][1] = s->mv[!dir][i][1] = s->current_picture.motion_val[!dir][s->block_index[i+2]][1] = s->current_picture.motion_val[!dir][s->block_index[i]][1]; @@ -2480,11 +2480,11 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) if (!direct) { if (bmvtype == BMV_TYPE_INTERPOLATED) { - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0], 0); - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0], 1); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, 0); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, 1); } else { dir = bmvtype == BMV_TYPE_BACKWARD; - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0], dir); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, dir); if (mvsw) { int dir2 = dir; if (mvsw) @@ -2500,7 +2500,7 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) v->blk_mv_type[s->block_index[1]] = 1; v->blk_mv_type[s->block_index[2]] = 1; v->blk_mv_type[s->block_index[3]] = 1; - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, 0, !dir); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, !dir); for (i = 0; i < 2; i++) { s->mv[!dir][i+2][0] = s->mv[!dir][i][0] = s->current_picture.motion_val[!dir][s->block_index[i+2]][0] = s->current_picture.motion_val[!dir][s->block_index[i]][0]; s->mv[!dir][i+2][1] = s->mv[!dir][i][1] = s->current_picture.motion_val[!dir][s->block_index[i+2]][1] = s->current_picture.motion_val[!dir][s->block_index[i]][1]; diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c index f70956e739..ad2caf6db2 100644 --- a/libavcodec/vc1_pred.c +++ b/libavcodec/vc1_pred.c @@ -468,7 +468,7 @@ void ff_vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y, /** Predict and set motion vector for interlaced frame picture MBs */ void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y, - int mvn, int r_x, int r_y, uint8_t* is_intra, int dir) + int mvn, int r_x, int r_y, int dir) { MpegEncContext *s = &v->s; int xy, wrap, off = 0; diff --git a/libavcodec/vc1_pred.h b/libavcodec/vc1_pred.h index 4d47f86696..ff894e0417 100644 --- a/libavcodec/vc1_pred.h +++ b/libavcodec/vc1_pred.h @@ -30,8 +30,7 @@ void ff_vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y, int mv1, int r_x, int r_y, uint8_t* is_intra, int pred_flag, int dir); void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y, - int mvn, int r_x, int r_y, uint8_t* is_intra, - int dir); + int mvn, int r_x, int r_y, int dir); void ff_vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int direct, int mvtype); void ff_vc1_pred_b_mv_intfi(VC1Context *v, int n, int *dmv_x, int *dmv_y, From patchwork Fri Oct 1 21:08:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30874 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2088093iob; Fri, 1 Oct 2021 14:09:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziPILRc0UWEcvC0+5ZrRgcEwqO9fMN05U9C+rNuFt3vd2AoMvXdkmgnGnwiSnJLdTttuQy X-Received: by 2002:a05:6402:1e93:: with SMTP id f19mr336776edf.88.1633122567803; Fri, 01 Oct 2021 14:09:27 -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 bf14si7875036edb.192.2021.10.01.14.09.27; Fri, 01 Oct 2021 14:09:27 -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=AEMsUlkW; 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 32D7068A8E7; Sat, 2 Oct 2021 00:09:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068011.outbound.protection.outlook.com [40.92.68.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDB4668A8B4 for ; Sat, 2 Oct 2021 00:09:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RdpdaCCryexm70hhD61pyADhuQuBw22rHH+cRnWqtrcqn992T6jlQSO5MnrysETbqzaxKWHNMU8pleaIUJBAMyeR9rA6udsABum2lEWKAOwfQRwp3lHSvnLsKZ+QORPBWMlhscI3ybSmzXSa/4WELcvVMs8g2U9z2hwhlmjSqNwQCzTSPYYvmt96EVum4n9ONFfhM9VCnTcIVFAHgbJ5syS93sge1/dHw5v6jdngF0dNpbEPcrSHzrYdc4/b1N4fm3tU7ADwrKQmBF2jWgNiM0sfLJ8F8hkoZpvdyY004/OuyU8r215LamuUrn8e9rNifJzy5/uP9exTJgma9vO0cA== 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=ZZw4UkhaxVke0w+wawlF3mYhZDrxuWYIhOIklaHjJmM=; b=O3X4I0WLuuIBMBza2oiU4dHFwW0RK9gu921SnLTSmixrfGsDnVSwwqOOqez2BxM1EUxrZjL/pgDnxYa7QfJHsK98c9lPJrBV/OPiz2RWxi7TjGCe+DcGQ3c1bgnB2vDJSm7UdFAJ1bLeMELyIWrYKZ/UDQr/T6ql5QYAiQ3CngUVOq8hlXp5qzfuyhjqW6jls0OiI3ChzqI22PZHKpsX+ptvWDaoiIX/iU0dL9GuQmkZrsXtWFqH4Uz7JAsjzXDEMDklSZhF9HKByUuJfdKhQCKLToBbQyDBgWnFCtfpGsu483qMbEXuraAV5d3waj5AoHAcQQTlJKcNKm/9DS9V8Q== 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=ZZw4UkhaxVke0w+wawlF3mYhZDrxuWYIhOIklaHjJmM=; b=AEMsUlkW469PtF78j6gobFvwWhdGJCxdXeRMA39gf+/LmvQOy0G+svrTpf6o+pS3ljsJjVMpTh6edjLz7IKxqRHzDJUUlNgOL4jEsSfShb22GJJKyznek+uILeDDK19TgMqGrvfcJQF5aivZ4wKQ/2Pm9WDqjXgM5P4kT8V9ZwKxCMqGzK3FAY0AYYF2fwLvkygxrB/2zyAL3Dl4Q3FJQxGMPDDvqvXeM2WjyasO6Xw/aBKej7in1Ac3FhXJ/P9piILz9oCZwNPjCu3qT82KEdc5zGajiSPKbQY12/jyMfersDAGpSHc4I+JaatkB5fBOYGYNcShOtAIztnsfU3OPw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:03 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:22 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [j/BN8wpQ1Aw73mVPsxcLk9WHUT0G7ROA] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6c628b09-947f-4973-4d49-08d9851fb251 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVM2asYY12qjM1/Eg4mHSQy+OiGWwLLFLtFDmYb9ObJGnwr1jAiV+CaKuw+Ox0Cwma2mRkbs5bNb2wnK75zRFyOawdI+LjMZMk9Whp7tATQC+7WcbjKBwQCW4ByLG4I1RWWWuWLGcNm9MuqqOusqRdizImLzCycLIcccbAb3Iu2m54P1tfg/gdNh6g9T92mEh1uLuCiR8xGA+aExsWWeIjOTXavmfazjsCgiuB2N7cnQjbo+z8aZscyCz0L+RA4LU5Zzuf70LOLO0anFMLeg3p3W7C/xhuf3EXxjbi0rwU2XHzfq+EgkeS8LOyxZS1tvwobhjgfZMKpec5g53wOrSsV25MnsdRHGtMS8+Ojf+8nDhhneUkbQiw6tlRzd2pVx+jRsAksDLcvw3X0AL7aI5aYSJ24WSuPmYPINth+0tNCNIfNMPdd3Gs9HgnIUvD8rsxTbyUkKTb+sTIFtVxaM8Rz3wihz26K7+uEK3HQf65BO/8j8SryPOSltffttXGGpzAGwH+vhytQwhrqpCYtMkw70jlkj5eGv4Az1C9lQLnwfIe8VoRLpVGcIL8aJ8RYKlzbplV/z/bXQLpLiAEWv5zFDKDEhqf5H7UI8eZ93hssJ+fFFpiLtOB4+5Ss+lbzZ3O6Yt4GQ9Vk2cbgzU+D/Wu0KSlSMiaJV3Sjl0p3nkTbvQ3OKGiknXRrsPPVi3YVy4RWy2R2KqQ5McQnxrU4YwaRl7hBpoZg89Q= X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +RCyFv6KVInzLmza5/uiP0dU7jC2/ZjfWhUgS43dDnMSFYDUd2ht2fYVGkIeCgFIHNqQ8VNKHQNLkSwSbN4fXfXwpf3MH/HHaej9rHgwXpxEnMCOPk4O7/7ysV1ta996xzcgv2tBGekFK2HDgbh2MrOiWD3xfCFkh95vVd8E8z42nYzY52HlNJS4KyLNUTn8Vi739XI5JJbyWx/3orN51Oi0TStRTraCO1iu7R1GM81bHULBKbL+wlMZdAL4wEMGmVaUNxbwDxAhurGo+Lyl7zscjxnvspMvf1D5+CfCBqvJBcz8pB7q3Zu3oCFXjjGGejtL118CJKFQW5nOF7YFZCg7a1JFY9gmSEVCgFABk8tOvm827+7C+Xf5ogDW23q0ketlzREV9UsD0Mfj1SrQ+MFdcFNilwI9pghiNaNVMsnygpfIzC4Lf2H1pGHDeP9Z X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qIvjpRKRkqoHwDD/vQaxtQ+4WgGB899XLNtwaCdeCRlo5tM7RYN+WnvA+45kkB+5latmmXm8vIhMaxaPvkXwfw1ytel0gh4N0J60iXG1sHj6Z55GgT/wuTKsX0QEQ/6x9iVhMbNNT3JFjtGtLqK8eg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c628b09-947f-4973-4d49-08d9851fb251 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:03.3979 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 05/20] avformat/sccdec: Remove nonsense cast 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: n5ijP+fBE8R1 In most contexts, arrays are automatically converted to a pointer to their first element; taking the address of the array just yields a pointer to an array of fixed-size arrays, which is not intended here. Signed-off-by: Andreas Rheinhardt --- libavformat/sccdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c index e95fd881a3..592609eb88 100644 --- a/libavformat/sccdec.c +++ b/libavformat/sccdec.c @@ -120,7 +120,7 @@ static int scc_read_header(AVFormatContext *s) next_ts = (hh * 3600LL + mm * 60LL + ss) * 1000LL + fs * 33LL; pos = ff_text_pos(&tr); - lline = (char *)&line; + lline = line; lline += 12; for (i = 0; i < 4095; i += 3) { From patchwork Fri Oct 1 21:08:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30866 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2088212iob; Fri, 1 Oct 2021 14:09:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCg7ZTQUug5bG3gSyAtq0JiUuT28uICpTSqVjJc7Wn2yXSenSTUkCNqu1AOILp2jtfhKJ9 X-Received: by 2002:a50:da04:: with SMTP id z4mr340472edj.52.1633122579274; Fri, 01 Oct 2021 14:09:39 -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 f20si8456450ejk.645.2021.10.01.14.09.39; Fri, 01 Oct 2021 14:09:39 -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=c4HlPumO; 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 5B29168A905; Sat, 2 Oct 2021 00:09:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068100.outbound.protection.outlook.com [40.92.68.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A17768A8DC for ; Sat, 2 Oct 2021 00:09:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OSKHet/I0aHdw5VwJ5dKP+AMFjS/rqGL6Tw1WiVFvqSeuHYj3xbIR9MLPiY6oQpLlHKaICnBHUZuywxCDbHmrqVdHrudhMfr1IzOP7WoUX4MrfRtNlcnU1R8ZCQRIO5j7R1wplZs/8jXAYvHKK/XbMXnfHkWh2OfuuynGZrtLhQ+LNZm2dPdNEYbojw14tOBG7QFH+yo+PtFxFclR1eYui1Mv9uCKwoGj/h5zJoKBD7RwifFqXbQ3DiHdN/HCec78cSlgxfp+nHDjQkh/PiZbqcRnU6Ftw7pn/e9WP0Vh09AEj+bGu2NY3W+gsQ7Tz/cCeDwvJqE98NTaZvXndDFlA== 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=RHvcMj2+jOYcMOG3R9AaH6/cWlFk+SzCNMa1HxOA+gs=; b=J7OTiF8qPxmPw7nhDIcn6zJBjs2KupRJ1P6DLe6bybVOH90zXZHPSfoSoiIkpiBUBOKW54BHu/jQzfIviqCn9BWTIFE7dzjMdNYmqu/IgaV6xjsqVuA1sjI6+0wReGsqBxmKad5LnwvO6eOpUC0ov+LkxWdFJDHhurtuo3zlpMGTJpORZ1uaDSJzRsb9cxSHRDsV+z2uRyebix9fmyIrcnVKYOttf3e6GxgK9GeFKHkC8Lakk0qKr+9BeBOgyXYwaT5kDt+m9e5FPB2vycWsECHPyjOWsGAyqw6zGqDrGqELg4GL6ybOz4QKIzle1Kav6ooMD/FSGzrdaBNspDYW+Q== 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=RHvcMj2+jOYcMOG3R9AaH6/cWlFk+SzCNMa1HxOA+gs=; b=c4HlPumOe9SYRmgHSJQ+j9X7SiJP8lbJ5CE5hyP4N9joqysrhgclVzc0K4Kef7XRKRgMH7++uWkczSsNLgPM6vATIPJS0LBLZCwTIOcIApTAEqCkNTf6mGQz1pm/2cfB6iPxlA8bZOe3I18TP/1xFF8r4PkZOaeMt7RUZKRVn6fyYmHrTqehZpHGDY04jY1muCWC3HZJeMzqsiS5rtaTesFtJFYs2Thd/908/wIUduzESkoGbLrz60+AfIdIDUbJsPzdrMr5kCkzX+Ot22gG+6vVSrzp53oUk3cshoHqfRqsSnG92AJ3a/QK4gDG2Jp7vIE82OvdeHTtJE1188GgNg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:14 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:23 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [TiZG+sTCbZwI0QrIHD5PJstZRgsVM8zr] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 109a31c0-ffcd-48f9-c24a-08d9851fb927 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTgZdhvd8QKnLjC/Dfe6SG91ARVHwq3PICswtUPbyB7GzYsg4grZguuQDgo0UNdJesCauIZ0FQrRyAeb0MjEaOy4J4yf/soqlShbLGBhxngWfTZzkugQhigzW1auQ3fE5LoXCCdzaVRK3BHYlq8GSpFFmexxvL53A5Fj08l/2kKpR+th+j4OUG18ZmaxprwOV79zlb+6003rrQ2IRM3r80tXqJ6QIxaD06zD/6OstlHW0eUh9bXkIbGJyW4V7hWhgQv+8JZvwP+UmMFc/kN5idUC2bEbXoboFA7lHoVZHL2pKCBmzU5tpfS4gNg+aIHPb2XE6klRoCguEZnHYTuQICRQ7CvhmhRYvJpGq+GG5v38+fftMBN4x2Os2+kHaIDxEhFanCX/tPDQ528a8e9AUDOYAFNFteQJu8VAxwtKaaM1wgyPfMKvK5ewhxvHdva88Ji7bq9mmzQmC4RT+ZyBiXsvweQaCdp2OPko8UqmOpnOd0wQQW0FV3+yTpmuTu4b1ojSGPPGJ6sVdWag3/qXP6So7M9nkmdalJ+WXRkNaXfEh9MtEDERjCaPZ3kIzveoPU+3C4GTRH58jrVSzUH4ofno+6rIbYhL9nvQ1Bg5tdAfd6FxRaDqTAd9emTZeaB+13MHBsanPsJXyinHbUT7qI6Fdlv4IUHCQeb8CvXrcPjf503GG6d2efJTHdQTp2E3iWRKeCPxV4zvWSywxfDhxgkHQnbn/JOlot9yxnG0NWaIirJIBCWjMoRBU4i5ahdEZA= X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 41lxYdIotfywqXN2Ty9pxBNAokwkPBkwVxsZxa1PKPT5P9yM9irgx64q19kj8OTy8DXPBF6k1ouY9HCojorwWq+xl3QuRxd/q28F1VP1UAGR9VU1pbBRCL/mElITA1t7InLKszzU3+qR/njMldtFKLBg/RI+IbVlXyW6ONzhTv9h7uvNNx+ODJlO7MsQEWXJRBsKCPX5CSpKWMLuo5/y7OXaTknXe8T5eIIfpGluw7YoTF4Pjch3rqcSYQPZq6fQWDtFInukZnPBS8JTRJQl/dgxlUQxMcFfx0YkSU90FRjGrUq+4b0FApeLUu9nU6HpBqs8mELHHqiUYcLaIjGBQ14Jt5rwysDt+sQCNb2ENphFnc2Rr5hBlY4/bC7Y8yq4AMCDyt4Qo1fMgYM2cM8voURniIWtsNmnP8gVXbQjO9gW0bLTbM+lRTWbb9sAt6cQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7o7aNfJILcRmjZVPfAx2fFQP1JTYNyyHKujCmY02B8pKNAGDg3UT1BQ+ULARRFN2lkdMeBSwvC3Nn0GJ9lO2Yfei96rzYxXv5HUOXrNTImB7vmiyn5wy7dh+0GTGqkvZ3asPSS5GV0LsZ8Osn6EyLg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 109a31c0-ffcd-48f9-c24a-08d9851fb927 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:14.8338 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 06/20] avformat/sccdec: Don't use uninitialized data, fix crash, simplify logic 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: mAqXpdA4XVHQ Up until now, the scc demuxer not only read the line that it intends to process, but also the next line, in order to be able to calculate the duration of the current line. This approach leads to unnecessary complexity and also to bugs: For the last line, the timing of the next subtitle is not only logically indeterminate, but also uninitialized and the same applies to the duration of the last packet derived from it.* Worse yet, in case of e.g. an empty file, it is not only the duration that is uninitialized, but the whole timing as well as the line buffer itself.** The latter is used in av_strtok(), which could lead to crashes. Furthermore, the current code always outputs at least one packet, even for empty files. This commit fixes all of this: It stops using two lines at a time; instead only the current line is dealt with and in case there is a packet after that, the duration of the last packet is fixed up after having already parsed it; consequently the duration of the last packet is left in its default state (meaning "unknown/up until the next subtitle"). If no further line could be read, processing is stopped; in particular, no packet is output for an empty file. *: Due to stack reuse it seems to be zero quite often; for the same reason Valgrind does not report any errors for a normal input file. **: While ff_subtitles_read_line() claims to always zero-terminate the buffer like snprintf(), it doesn't do so if it didn't read anything. And even if it did, it would not necessarily help here: The current code jumps over 12 bytes that it deems to have read even when it hasn't. Signed-off-by: Andreas Rheinhardt --- libavformat/sccdec.c | 54 ++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 39 deletions(-) diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c index 592609eb88..1861a99aad 100644 --- a/libavformat/sccdec.c +++ b/libavformat/sccdec.c @@ -63,8 +63,7 @@ static int scc_read_header(AVFormatContext *s) { SCCContext *scc = s->priv_data; AVStream *st = avformat_new_stream(s, NULL); - char line2[4096], line[4096]; - int64_t pos, ts, next_ts = AV_NOPTS_VALUE; + AVPacket *sub = NULL; ptrdiff_t len; uint8_t out[4096]; FFTextReader tr; @@ -77,47 +76,26 @@ static int scc_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codecpar->codec_id = AV_CODEC_ID_EIA_608; - while (!ff_text_eof(&tr) || next_ts == AV_NOPTS_VALUE || line2[0]) { + while (1) { char *saveptr = NULL, *lline; int hh, mm, ss, fs, i; - AVPacket *sub; + char line[4096]; + int64_t pos, ts; - if (next_ts == AV_NOPTS_VALUE) { - while (!ff_text_eof(&tr)) { - len = ff_subtitles_read_line(&tr, line, sizeof(line)); - if (len <= 13) - continue; + len = ff_subtitles_read_line(&tr, line, sizeof(line)); + if (len <= 13) { + if (ff_text_eof(&tr)) + break; + continue; + } if (!strncmp(line, "Scenarist_SCC V1.0", 18)) continue; - if (av_sscanf(line, "%d:%d:%d%*[:;]%d", &hh, &mm, &ss, &fs) == 4) - break; - } - - ts = (hh * 3600LL + mm * 60LL + ss) * 1000LL + fs * 33LL; - - while (!ff_text_eof(&tr)) { - len = ff_subtitles_read_line(&tr, line2, sizeof(line2)); - if (len <= 13) - continue; - - if (av_sscanf(line2, "%d:%d:%d%*[:;]%d", &hh, &mm, &ss, &fs) == 4) - break; - } - } else { - memmove(line, line2, sizeof(line)); - line2[0] = 0; - - while (!ff_text_eof(&tr)) { - len = ff_subtitles_read_line(&tr, line2, sizeof(line2)); - if (len <= 13) - continue; - - if (av_sscanf(line2, "%d:%d:%d%*[:;]%d", &hh, &mm, &ss, &fs) == 4) - break; - } - } + if (av_sscanf(line, "%d:%d:%d%*[:;]%d", &hh, &mm, &ss, &fs) != 4) + continue; - next_ts = (hh * 3600LL + mm * 60LL + ss) * 1000LL + fs * 33LL; + ts = (hh * 3600LL + mm * 60LL + ss) * 1000LL + fs * 33LL; + if (sub) + sub->duration = ts - sub->pts; pos = ff_text_pos(&tr); lline = line; @@ -168,8 +146,6 @@ static int scc_read_header(AVFormatContext *s) sub->pos = pos; sub->pts = ts; - sub->duration = next_ts - ts; - ts = next_ts; } ff_subtitles_queue_finalize(s, &scc->q); From patchwork Fri Oct 1 21:08:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30872 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2088530iob; Fri, 1 Oct 2021 14:10:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdrg9CqJViuio8Ywa9zFijeVaT+Y8ucMRSogdhY8tkzc5Y99PfaAoSM+PKsbJLLD5gi8BO X-Received: by 2002:a17:906:3148:: with SMTP id e8mr144301eje.240.1633122603082; Fri, 01 Oct 2021 14:10:03 -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 jl10si5355271ejc.112.2021.10.01.14.10.02; Fri, 01 Oct 2021 14:10:03 -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="WW/Zw15i"; 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 ABB2668A936; Sat, 2 Oct 2021 00:09:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068026.outbound.protection.outlook.com [40.92.68.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80E3168A8A5 for ; Sat, 2 Oct 2021 00:09:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VpZS+evXrEAyXibkMccbRFuRsbuo8ySjP1HjFQi6/ze6olLveWgJHW7fpv6kvF8cby1c6wum0gOnpRDjVb4qb4Yg1m9Cx6dqL3Chy0uM1VozFoZsGsMQhuLc83RXuoa2detEmIQ5XAwdaPCoPDJwtmnIrPm8ER7viHpwQXbvM2kklO5+v78+l/1h2KOjaSiuUe9ayZk24/YE2BB43E3tL/MN/CftGSS61vDxUovhmBVjd6P6OBMVnUF/wA5/G/h9tCGNL64DoaqOuL10dl0hWUEGF+68Pq4SElX2JOLtUgn+5x5V65a0xGRVMhu6e7mm+PMjT9FAB8f9dSmVsZR0mw== 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=F86fFTt2k3RLWf6oQbWBRQ6z3qARoG+np1WBtzGayqQ=; b=H34vGurttTwBYJ5UyB8FsD1cjIusEdnM7l1hiNbRdEosyQjpXFPBMNn5H9JefB+EojHToVFOjwcjUad/M+bO3JmyJMiHLf1kY/Lg6OGpSw9zy1lLfFlc2Rz4i5QvCnvaYTbuKnMDW9DNoF11V9bhRWma0PVvh46Nv0DrTcumZCFrKTl9nYO7HxCzZyhViF7Fcm7C66mHdg3jcGwqlCqlJhaXuPomEb5+4awtV+oyEI16o2X4nGnqeaGvGxnNV/VOnCC2zhYIr0Dgp7pO907j+mnJaSN512iLfNWKELUCtqZusfekgKBZ35o3tePRE0VGR0BKf4wR0Wj7Df0xqehEQg== 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=F86fFTt2k3RLWf6oQbWBRQ6z3qARoG+np1WBtzGayqQ=; b=WW/Zw15iCMjy1eWQkTMARTpfcZ/2XuV2HyxCrYRateHkiCIvX8ANpMolcGDdhyq4Kj1aIJ9MfMfU2RStzsT6DOszgFv5dBLreEOGC32az4g6+FytX/ZC+StzUrDfhBJtIETM4jqQQQ2Ey1h2RNbnETyg4Ymjo/co7ht/IJyu+hWonHooLPj2TANDFRYfMpH7u0Rp0u8i3oCOGJoNlynRrBqz0RSOpuHbCtOowKaziq4mVwwQuPe1BZ/vNHgFeLiTW8mvbwdD7acC7349fsaUaeuh+opX3PPrMVueDSbuY/ScQulU8Xl98ODKWO6NWBDOxLVMdoAeNfBMbTBNb9VVnw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:23 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [VWuNdf0c9fplmAOYWgxhntzOGLNT/Vm+] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 266ea572-9c7d-4694-73e8-08d9851fbe5a X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL387mJJPv+D1gZZJNbM3QQM5verKeruayumwV7+jBy+iMc+GU9idAYj7HRx1GvoFU39LDgCCkkVw6UtFi+f4UmFEfQi2x8HWpMAQqzhSmTp61qxR4rAM4NytG2Vx1nsjlPSXm6LfRx2wWJL4fNN9ma4ZcBy4xs8r2R7BCKNI6VjS5Jp7N/uw7XpxW9bEj/zin8QTD9o8kWJbf6syE2am6JdnJNnEXB5U6KtM6K7N8iCO2JMH4NANeQSRgARBbNpEJ8CGWt2KvOFKgXRictabjRHd+hBUShriT+0EooXtyb2oWLgi5q4CIjrVpEJqRPFe9gC/HR1MOtCZCE2qIEQwHQx/zSSUmHmhtFFSENoXswcZcm1E6UvOgr8cGmfr5bccDhOBVQY6G3eugFsC7hPVvVqEyAeS1eSbwqFH9ymTnjhIrcXNgjd7oewPZZYE+3wOV5w3+z6FKJ36z9T2ahXfbsXDx/hGvFmJWW4in4czYDwJHVCOMTCT5zV6nUNOSQ6G0Zy80/dvTuemGWHqdJs7n3+VI5bN21EAmgRg2GBH1RMsMGYS3h8qzmEY+AoBux7IQDMUdYTi/ijBJ2Yg4gvjDEJUetIuzsY7p3YHfBIEVaVCKHsRUi5u/tJuSvZ+FncrtJNoTVTJCx7je1Jpum+UEnqRLkUDgZM06i3MjTXYvNeI3AB1sYsUgI9Usn5WgORXaobzge2yXH1g== X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UhnITTU5ivf5t2pIn38AQnj593aaibB0PiKnmSA98gLrpIQuxJjCswDzQPovYyMu+ChyT/GCPwHywR6rlNaugsYelsIo1QkKXqoHbgctWg86Ev2kXH4s9FBzz9/xmYa6XSz4arS7t9vhcSIpH99spTxZ4eoI3hc2pPF+J+8nV9KdOSfK/fq9/l6p83MS4Ajj7H73RTxe4Px1F+BqTutGHnMnGhthSe4x9j0wuJToWPBeAu5GDh+9yerbvDz5wv1PzoAw5E7dEkUpPEgdL/85c2BOmNOUn2xaMX6AoBBqOmxsWPw1hipSsMw8J3ZTHyvvU/XP4sODCYTfcn9+kCEukJNf3zYVTns5nZ8vFi/lZh2I1qXedCWZVG6e4L0yxeujGeSruCyvB6Nzdz8p05bdgKiNB51ZPyodYdPGlN9o/J/F/2FLQMRrqiANwZSzsIT2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GLM+yh/D01zUgAOSvm64azFpV5nqKqgjECiZUepGsdVPWLfNqRdMOFPJfd5fyJ7GX3FUmj50xR501GPii2b7YnD2dHHgAa9tk1iUaMJ31Uu15M9DlkGXDFAJYCXAo4shG1mqJL46K3rUKdTBLWJDBw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 266ea572-9c7d-4694-73e8-08d9851fbe5a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:23.5935 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 07/20] avformat/sccdec: Remove redundant 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: zzUXlasBDCW0 The av_sscanf() will filter lines like "Scenarist_SCC V1.0" out. Signed-off-by: Andreas Rheinhardt --- libavformat/sccdec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c index 1861a99aad..efd6024001 100644 --- a/libavformat/sccdec.c +++ b/libavformat/sccdec.c @@ -88,8 +88,6 @@ static int scc_read_header(AVFormatContext *s) break; continue; } - if (!strncmp(line, "Scenarist_SCC V1.0", 18)) - continue; if (av_sscanf(line, "%d:%d:%d%*[:;]%d", &hh, &mm, &ss, &fs) != 4) continue; From patchwork Fri Oct 1 21:08:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30869 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2088691iob; Fri, 1 Oct 2021 14:10:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMoPmFtn5umLoNN4fGaXpxMuoREhXyld19gXiTQNpRgX55jQcqTi0vN1A2nj+h2GGxJy9r X-Received: by 2002:a05:6402:220c:: with SMTP id cq12mr269594edb.229.1633122614647; Fri, 01 Oct 2021 14:10:14 -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 d9si6690203ejo.61.2021.10.01.14.10.14; Fri, 01 Oct 2021 14:10:14 -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="I/PNEhcX"; 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 4EA4168A949; Sat, 2 Oct 2021 00:09:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068045.outbound.protection.outlook.com [40.92.68.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F2BD68A8E4 for ; Sat, 2 Oct 2021 00:09:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A/0FjPfZbRLRG11T+kSx/WPdtV+1HwlWCMybvvgzK3kVmc+tLK0fVyx/wrmD2ehWydpZ1c8Elau6sCQHkLcIJzTZQXkPPTwD3uSi4FWBMgWg5mnT6Q5dhMkI7xtOONfpsxwRdl9MM1+aOK1MjiT8H2nMGk+waPrKaLuNbOkhPLp+8WMwMPeCjoECaqCHv/+Z59prTTILtPY80R6GEOcsdVndo5vFX88Xk9jux/X9G6KumM7oBARGocKuk+3s1qgF0gLZ5TLviU8QOZTypiOkdYn5xAZ87b0ZQia/IxAlBtPhZ9z2+YCXhEYx8PhrLNbTGIIlJLuNXAzsPNIaa5OsFw== 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=ncJ0myu+x5rUaXAc8VT5iVTP4g1AuXC69GCaijxqEfA=; b=hY9No9FHpEtphblEOORMXzSXdvH0O/97VooHaXHiJMv0w4f84aJ9IJ52tEoOm/1SixH8Cb2d6/YScMb+xp+NJX5T5WLCTQ2BTj7X9SiKSwPhuqF9O7wOM2wDMvT3r2GiUNDU3CUKQhZaUnlkaeedMWuNumCxdAu2iusDyL0Zor8fWXIz+fXOQ4YALojPBBS/ECp5Bzj5Llej6A0HxC3jh4OamgW+OGO6vrLS2qOjgA25GmWVHylNF7DgYcbpcnQ0PUxU15PCK5SUfrdYP+C4e5f4UhsDJiEmmDS0mt9WNFgmIfbl/SfsUdalnRr/rQoZvzGKUNFOHkTCi7T/dVL30w== 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=ncJ0myu+x5rUaXAc8VT5iVTP4g1AuXC69GCaijxqEfA=; b=I/PNEhcX0uPE0uIzeoOX8lxCQPC20VqJadu34aTgKx562zJvJf6vFya78J2Ocd+tzkoa9T3q0eDHRyAuKEzzRsfBZ4TFBT8LyoKqVgLLOMO00S4mFzgljUOOmt/52kJ3P2KuZ+pz8nwJ8Sn9GTuW+BY8zeb7GAHAeAuRp+RiAZ8JUngGRfgCvlSL0cV3gZDOGht327J3jeCiU69wML0QsoD9AdmTWZPnEVXtfMJIxDjSUySH+47wo8t8ou9fv0ZZJc0Rl5fKTl5p/3lLz632iD/8RxUwi/bMjEJH1+I05jkldKrI5+RLcFgxh1PKeYtg/UaR/dcqfGGh4nxZLxqdtA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:27 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:25 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [GZVKK+BW1MPEciTK94OEDFkG12p5S920] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a97a1be4-d24a-44a1-d83e-08d9851fc082 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTgZdhvd8QKnLjC/Dfe6SG94evM0MiMY6noXHVNpvi7Ms7+Dhc8W3flRtbDFVBdTozc9XE+aLcQh8NxeKgmYU60E2JwXoNGybnHuT7Ph3qGcvLmZAqepWGFzdLvr8MlEWs9WN7GM0sxhEc26Zeu8FYuS6qW5Qk2lIGIifX7q4rRhP/o5o4rpX0GdX0mkAZtbDdA0XU83qdN5FEgDW1YlLR+NKT1zZYS3pku6JLNiU2ZmdmSmIVSNQyjBLQJt/QLcA1Tz6W5jx9oE3yeRICmNsh6FroZCmBwO3I2YyP7kz+siRqZ6Pi4dr58bWndjmcyLJFSgXVtalJRFXFsM/TP7EHcS777ZL9Pr3PhkIUyWE7Dx3q3K5oXF+2wn7To6Fsm6WQLM3kCLuQFGMvGhAUAqfI0PRUY9iu2AU1lxjMz38mk7MzK3XqyGQpmPjlydzr21E14nqx0E86tMmEUWBO1lKJlGNrs0RQskXD5fLlzU5M1oYd8rym258WJHDc0TOj5SXm61nDSPMHU2j5/fXn2ZdkTsKi7f3BS1Nu7JMLlxOr5oMeScBBp8VGekoLDGYT6eSWhJh3RoeauoQAEqW15TWZG6e5iZ+Ebw8Q1PCygx24gTIesvBLscV0oDrWTCA0cQyJUycNi5LpTE0Vd/LlvIwSTOPfo4b/uPtzYJ2zhr+a+k48zQqd0LXYigjS6P3DbwCUyMp1VkiMg2jup3dpZBiEa9bhvkQT0oJhoJjKY+fAZFJ+sMldDT+XCTYH1U/LTH94= X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eK1nx7vd/+l0BEqsNlWAtIb4hjpQtEmaM8Wp9WWZVvjlCyd/ERCysM6WjSq/TBr3XFvALEulVNLpOVD8itQKvOe0XWoqXqHhXWilKGsPNLQTzVcCGtbtex3xQZyAhvJJGvbW4nPNWXrR3KH8iUAccyr3ldG8soAw/pqmMLj/5gmq1mqLDVkkwmU2n7qllOZvXNdrVaC2opPnQ7n/aI9qWQxvg78B69jt+zBHXdXPQSKJxBA7WYixA52bkKc67e0/LNO3Mz6aBAF6Hz5rR7DfNGOEufpZkgO+TIsDmLm571WhDejA0/b8zOYcxdlRlcAo7Ynvds7BfzWdg6zm5gPgsOeumycPM2RFxTmRKid3jcGjAbA0Sf1Ll/tqwiOnMdzgtREKZEAHiPuO7I3Ijk0+9hYYXrcE/ML23OMzMbNjUyqIN/w2HdHo1+3SCQfZC4yz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4sRBYDEnnWJcFPW5qNE28agtaDhaPnTCT/+IdGb4U5NjtaFhuSOjOP+05zaUX8SzzPEI725DP0FOS1zKrNbVCoRePZOe/hTYaWV+y6gaBHy1UXbXvTbUTPGwOq7U/LGYdlzA+VUI+ZoTc5RYL/tdgQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a97a1be4-d24a-44a1-d83e-08d9851fc082 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:27.2266 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 08/20] avformat/sccdec: Fix position of returned subtitle packets 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: Pzs31vQIdXTv Signed-off-by: Andreas Rheinhardt --- libavformat/sccdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c index efd6024001..0b3e1ab74c 100644 --- a/libavformat/sccdec.c +++ b/libavformat/sccdec.c @@ -82,6 +82,7 @@ static int scc_read_header(AVFormatContext *s) char line[4096]; int64_t pos, ts; + pos = ff_text_pos(&tr); len = ff_subtitles_read_line(&tr, line, sizeof(line)); if (len <= 13) { if (ff_text_eof(&tr)) @@ -95,7 +96,6 @@ static int scc_read_header(AVFormatContext *s) if (sub) sub->duration = ts - sub->pts; - pos = ff_text_pos(&tr); lline = line; lline += 12; From patchwork Fri Oct 1 21:08:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30863 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2088808iob; Fri, 1 Oct 2021 14:10:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyM+1NWvZKiOPIXAD6YWaCaRfHTdbQlrFdF06BEwPAz938vHQVrz2p2BMnMcnIuZ1cY+iOO X-Received: by 2002:a05:6402:5191:: with SMTP id q17mr317649edd.332.1633122625027; Fri, 01 Oct 2021 14:10:25 -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 gn9si10120564ejc.550.2021.10.01.14.10.24; Fri, 01 Oct 2021 14:10:25 -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=eQQZcnOj; 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 5301068A921; Sat, 2 Oct 2021 00:09:33 +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-vi1eur05olkn2103.outbound.protection.outlook.com [40.92.90.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A659768A921 for ; Sat, 2 Oct 2021 00:09:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=He1PQpgL3YOUb/F6theitCtGn0Dh6fyl7zjAyS7Lpaq9TOzlZw3xUUY8boxF+bqNhWCebXwFaiGSOG0GvCdHaB+E3t+qeA5NT9zRjIsThStjnL/2ic/zwmDNUrcasontucGvE5uC6/g3oDrby4Frb9cHtN9mIwKNWWM0Td+QZy2jbbgwE4QHObwM0E8tpICeoUltjGkYquf5HzbbTURJESp70a2BgUbmwTDCzmc3Hs4P6j5Gjx9cjUSiGhYYaAVZlN93iNUvvaN4MkKniz78/q2oHMa2qppSSlKGOtGcPHoj8tsr0ztXAb3a6PtQtDaK3+pmjD6MVYI+6YcoLLhs9A== 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=eK2Pkv5f+4kxsRRXrdbAhsvTjs/23T3gSCKgejGkf78=; b=HyOuTkZRuqBJvRERB/RVuBk6RmL4Jd1IR4La/5bVGvYenomdo9ODuaOlf3IsUXo6Wsl0zcEUy3X5NsLwkhSKXv3zjxYhMoMPZDuRPpmL7u62SA5f9rBL/6wlz4Gb2t+y65FCcO1YUO2iiM1k8Mwk8T1jng115qSFyfHYcWD36DTfgMy5HDLtA81cSaCErnkdEIs/DQBIjaagm250PXJuO1x3u8MhezsVtrc+RyjVHPbWZXJpD2dHYu+NtEK37y/PnvClKe96uOOHj+KRFo9CgtauN30xWPRGiubpWNMIt+T2m4tXzOqfhsrI+YJWeYf1dVglZMdkTEAAWipKIdBBaw== 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=eK2Pkv5f+4kxsRRXrdbAhsvTjs/23T3gSCKgejGkf78=; b=eQQZcnOjjn4cgqJgPJj/03WWiDcMa/s9WFl1RvdLL6pKaayQw9imG2Hnh4xtojQN9ZQc0bxA1yfsGPltYkWf9pSL8V4YVp7X2gRZkvDVH4Jl7mJDtKe8qz5Uhid95X5kpVucuZnQr+tbCRtrbb6fddINqvC3JwbxqveHF1x0zTTw7RSB+2iG44XPrkR+BaU7k4TNaOKqJIoRaSfR4pcndZuui/bIPspY+Gpk5xrINIRh1J5k0DxaKmjitLH25pvREK1aoVcM74HYSFaQFdAmDXpJ9yVajebDl5bMEh0zEjduB1BRTyxdNMVAPWMh6J7MtWNz777w2P0d/040fkCzpw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:31 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:26 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [fh55nodbcCMC/AK0BI/HTrRYuyjxA+tj] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 51202936-6c79-4e76-cdcb-08d9851fc2eb X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL387mJJPv+D1gZZJNbM3QQxFAfhnnTYu3NTP++wfmW63bI68f6/GtPcje0MZk1BWnWCEZDb6cialRf8CbpJOjzXfCHpdpTgBigTciRLq9nHQQjkWy4RAEoIAWshoYRZwPiD4JKBwwSvxX5ohiJB2REvvppyV0vTymdT6DkvwGNFjDn6nm2V+o57wN9tbwpl3qv0Ji0WcFlJBcu7hOJeEzaYKu42J0Jgxx0uqGEhXqxhk2gJWLYBdlwNY6hTbz3CRcSRidk0xb+ZgiVn1nK0Hf8xbDiTDtwHoyqvxOaqEE3TPJg96q7OESzOEOhgbjZrVq9iyEe5bC/FqhkR/gMY8lHK0JtcesIcYdRRQAIsTG6HadYylqaYxfr4K9LuvIuOHkpXw7E3xnlVrrgxiYDasqjsJUE8eHqYjZlvrQ62LkgcMRikBCbfLpx/tR3tYJPzUPcZGqLYVhKDD7XYTGgBR8Tu6Oee1d/vH72YKSi2kwFkUlgvq5XR7HLMn897u6oIdk4TRAIKoPUACAxyWVrwOMPi8szgnExIeauzpl40CjEeYA+uwafEnMLl2aFbEXkZ6rFMg02XfpXzogrjI7GE0tluLZXpIBox9s22kXyhjleXKrgJARW46gNoW9xKuRl9SeDrpft2CXPUJvYbVR3F29MAIBEb9EC91eon3mg9uAxW/ggNJTGGv10aJ5Xm3393DJF2Rs+voDmWw== X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: neRSF1C6qRuC/hCAU3dDMf3NkuO6fHGcYlUGuGofbmDrjjAPgB/gucCLVmTse0AoNZSWoc5duAbh044CQcfPOKoOVlTDkIpUiG7nWg8Shv6jLlyFgdYXRWtY8NiGCgGAaspdjyTkg0NjHWFBypGPoVxsqq694wCaLFvuGEHVRNFn1mY0t0XxtpOYUofGXv1hQ2KjOH5PgzWCW8wJGsQgeoj5rmYKkE+JKohSzjiqI+ZQTkeeoCkrnEFSjX4zg3M6RvpCE322A4wUbya8h+49VO2jiAr6wMcHjHlzPTzzIJHk+ySYPazyovG+p1I8RMeNHbPyPWWfmiM2B1qiHdutrn/JAn5ZkmOjYUgSveA0GGRxg2luqlmSvkSVJ3oYR3O68kPyvIYYw30HihpMDgAmpCm4MQOKg53q30icPnRhCe3W/3jlhgMlQPbcI/bhuNZk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QUOSFPJ7a882yycd460vYMEErI8o34+qYxM5qyX/QzriRfkGnhzBuURmAU5NfG1KtlKo51TKdVZ2dftSimNq4xjHo2zRYrRAFzWduoMB7sHH0YZ0aujcHXlQFdqZGhyo36g3zPzTJEU9QXtN1PYF3Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51202936-6c79-4e76-cdcb-08d9851fc2eb X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:31.2629 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 09/20] avformat/sccdec: Make constants more intelligible 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: a1m+dxcwLRMb Signed-off-by: Andreas Rheinhardt --- libavformat/sccdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c index 0b3e1ab74c..ea9f014cf2 100644 --- a/libavformat/sccdec.c +++ b/libavformat/sccdec.c @@ -51,9 +51,9 @@ static int scc_probe(const AVProbeData *p) static int convert(uint8_t x) { if (x >= 'a') - x -= 87; + x -= 'a' - 10; else if (x >= 'A') - x -= 55; + x -= 'A' - 10; else x -= '0'; return x; From patchwork Fri Oct 1 21:08:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30875 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2088940iob; Fri, 1 Oct 2021 14:10:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHGNQDgoYmOg5ruQ0w9K2bz6A1a9qC8NDpNTmR30KJBB3Z4KUT87k2PHRMLr8eL+OTSBe1 X-Received: by 2002:a17:906:29d0:: with SMTP id y16mr89685eje.477.1633122634955; Fri, 01 Oct 2021 14:10:34 -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 w8si10909792ede.307.2021.10.01.14.10.34; Fri, 01 Oct 2021 14:10:34 -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=pd59rfbn; 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 5F8F868A99E; Sat, 2 Oct 2021 00:09:36 +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-vi1eur05olkn2028.outbound.protection.outlook.com [40.92.90.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2373068A958 for ; Sat, 2 Oct 2021 00:09:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AQGmQ8PmwkHsYmINfWEeXTo1CXjkga2ln9G772unEWUH7KUjQAHS6pF5VXM1LLyKNmkRLkj1yQRH3sMbECBilFKiydyOAHN7AhUQnLLSu10F385yA+mmGzrU/44obhPAewPzWCdJsHr0H5+LQK0Uh1wzr5m96BxyHnxiafG2GJhf4DuHJQ+JY/3Qihb/cDgNy2BBu1GgLmjmBG8Hexhwtwm4k833JcyHUCoZqtYVfho4reH/3LmmKgNhKBCVZKrgXw357GyR0kSYGwV80QWEuR7rxro1C+fR++NJyJbH6b+tWRhPiSz3dO1R9QdldQO8YdzpzBq8mY/IAbmgv/q40g== 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=DN5V2IIbNqmezEEZTFm+k+zstgGxzJ8Cp1OaNHFjw9s=; b=MvaKpTJFdQo+FzMmg7ZoaM0emofDz/anXEfQCF8OHSGzES1F0qS/jLTYaNa4w+mOn2ubITUIWSU6ZbdrnX8SawDMYtD+jkgu14hv67xlMIVFec6/n/pJ1laM6cgn//ZBfHbdC07bqXPXxbt85oogMxJasXcsjsz0Ca0HDXJpSsvyKT/yk+cEUnNlVtRj8Dw5OURG0Uet94JN3t1vLbNyzqs1E1iJoQ3BxaMQtf7GP+ym4noVUprdlBCQ4oFQHAmEqLqZt1mR2VAt3XPHU1LSyueTzFDUWH9lcunRmtMiVIkqMXBKwkKS/FV9ai/QO7Fp9NhFKiCdec40uTAWgdil6A== 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=DN5V2IIbNqmezEEZTFm+k+zstgGxzJ8Cp1OaNHFjw9s=; b=pd59rfbnaXak+gCXtH/O6v81tv4n0DSqrOF4XHRtbFgayOZhbiahLSw5YzdvlA4TfFHwhV7N9X/TWQfkA7YRXaw6bFfPrXnB9qF6m+BrPGdx6B+avEPYQsDzGQWAezgqtXmUFvVMno/qy800bqDzyEs4J++MS2oqadP5grUtGQtwHMwdeBagkq+1gn841HevJB2a3LdVb4jcrnQFtAqRJd5g9ULdMPwLCTjWsofIqzjOY9GP/4wp9h92+WWpYrq1WSP6HTOf6JPoODvwJQV6GDRgHrivaGSvKEI6Lx2DC8BoJxz0C5z/NlysVpq1kGFP2TGfu/s836CpZ6LP64mgFQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:34 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [aD8YYII4T7q8/ZsVUnBf4ljR7XukcEgC] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84e8d459-fa41-4760-5d1e-08d9851fc487 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL387mJJPv+D1gZZJNbM3QQmcwZinFrfG33M+qMCk0kTvrkYMJ/0PDR3UTJqhU4Ihvyu+h1hbnOrX0PBKe1+oqG3Wt175JuwYI50h7rF8/2ngfBE4SlPnOzFaXYo+RsYaUCuC/Mb29Fx70gU3P4FXTekdR04JCl39okv1xWlYcyjgQ261H+HRBb/rSNoKms6Bwwa97lfsQ7veWQdxDk/FGepcF40247z7wRD41IrYcrzefGTAw5QCY52C8OoVjON8zbAWdG4CQ9U9B12Yi9+uUZdY+/BvPB2252YyRSf2LLOectuxlWOe0Vx8ZP6+BkQMzO9rShqeTnlFsUTyS5qGDFwlZtDHeCc+DOeuxgzlhOcAu9JjruPiHFdNYhcCBVwOt9GQXPWz+x2KFA0c9QH0ytznD4zqrrJwKwWVoVtSs9YysQxV+Hj/gTpDwVLsyQtPi0L0NFlbEeHgfvMrgqBSLfLg4LafnaVDAIW3mZc4vtJiAKWzQhps4pHqZjOw0yR/+05iNZ/x4LgU7uwRGzHp5lFlmdXpQGQIsQnDPxrHoqXUJw2xlniRnAEiiha658asJgRxfmeHEHq7fr63mGfJhAkkFo3NrXqF0465rgCQYPJShP2YuwMkOBc/I9vb1POYUMTz1Nvjl7DF8Y4QDKvrS5vrYEVHIj9sl8fhu9kli90NtUWqYPt6Sw34bpnHH+G13k+ilGvRUnmQ== X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /l1AECefoiduFDs4rAcB9yTyWqQjZlQIxAAuqEfUJB+ATWma5HFud9INW7Kg8+vDMlbzjAR1qrRoMfAgo05dhMfJrJkQxWDE4MM6vWQBrVqdsnFrQxyn+Oyx1nm0IJebJWs22FQ1kU5zRsCQBdHxfja8/qhh3OPSPWoQVDDnEgNg3BtseRXLvnVl115EBdpJbmONwx2fPGybS/JJ0933PhPgXDWomoeqm7JVLq/5kkS/kPy377grn0EfI9TqWImpGrRtyVNvJaRfqF3Tb3nsfWpSJOg8HLZhBf8FFKhf6RNf+DqAnNk9YDPlbdrT0UyrBSVkPAdc0LOY5sslVhCiY3DhvSAj8+nFQC19lR42KKcJf3JxAUEGUiw4pprfy9A/hRhHwDxx4DKgiLraYI0c/+AqoRQgkwLUo1WB4oYar0KHWiukj41GjUhEBFMkafY5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xQryeiv2KliB4qMB/oeSrNr/NS/+qK+1k6+u7HX6VVjaJtZdD211AetWJqnUWn4+idF3z3cWzNiqUJSadm6KiSDkjR+Krr44l+k8claTkVJSsfJi708Sfkw2+UQIgKQNFUBOPTvXiVN5EAPL4iAutg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84e8d459-fa41-4760-5d1e-08d9851fc487 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:33.9512 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 10/20] avformat/sccdec: Avoid zero-terminating unnecessarily 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: Kqcmzp7UgzmO ff_subtitles_queue_insert() does not require its events to be zero-terminated as it has a parameter for the length. Signed-off-by: Andreas Rheinhardt --- libavformat/sccdec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c index ea9f014cf2..6935ea4c3e 100644 --- a/libavformat/sccdec.c +++ b/libavformat/sccdec.c @@ -117,8 +117,6 @@ static int scc_read_header(AVFormatContext *s) if (i > 12 && o1 == 0x94 && o2 == 0x20 && saveptr && (av_strncasecmp(saveptr, "942f", 4) && !av_strncasecmp(saveptr, "942c", 4))) { - out[i] = 0; - sub = ff_subtitles_queue_insert(&scc->q, out, i, 0); if (!sub) return AVERROR(ENOMEM); @@ -136,8 +134,6 @@ static int scc_read_header(AVFormatContext *s) out[i+2] = o2; } - out[i] = 0; - sub = ff_subtitles_queue_insert(&scc->q, out, i, 0); if (!sub) return AVERROR(ENOMEM); From patchwork Fri Oct 1 21:08:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30873 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2089097iob; Fri, 1 Oct 2021 14:10:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQZ/kTQ6lQwunS0iUORNd6dReCywXHFxn2BTbssepsjZH9+Nui6bd7ZgzlBpFnUdy/BarK X-Received: by 2002:a05:6402:5250:: with SMTP id t16mr269736edd.227.1633122646026; Fri, 01 Oct 2021 14:10:46 -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 o14si8807349edr.422.2021.10.01.14.10.45; Fri, 01 Oct 2021 14:10:46 -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=DV0Rdg8a; 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 7E9D668A9A7; Sat, 2 Oct 2021 00:09:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068077.outbound.protection.outlook.com [40.92.68.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D47F68A994 for ; Sat, 2 Oct 2021 00:09:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NpMoraM1d+zJRTZ4ddk+o6n259LTiLllBFWQDYQHBZneRCtJ1gIFEf6TWn9qliH9vQhuWpic4iesJA/r64t4hvbXsoAT23CZQRzApOTXfsyr93WFzP5fc+u8HhkrhfZTEdx7MzgImn5uRcacXHAb7UNWXjaYzCxYgtB8pe6EVBVtQgjLxh4Wq0ebzyYa1SfQQkjutXS0XM1kxP9Biel+pEwo6Z874zYipqR7JBe/wCKHCCpPDNc6Ff1jW194WHseKocM9Vcp8UeMVYweryzX0kf9z7Cx+2xl5qOQjtkYV250JY2l3ccrN1GcZf2sdQet+JNNzI72qV5XN0x+N6/Y9A== 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=YILt5b8IhusTHX1eols8ourrfeWKeJrbiTRA40g1Bw8=; b=RyWMlCJOSDdHvPkNL7Do4r9x9H15CihGmeKEfUMom6bZmJTKkcmwIMn78R+vreSYimV6kg7He8JcjIwcM0hQsDYRolsyXuK5np+ZWQ1NwgxBFtUSRZg5K/nOCkdPbDQ7astSULjfJUXD2YI40Od3iTIztVA8nlEDcqoN6WLoe0zSM2cngxLE3YNVD7N4RzzRiHsD2H1WRljz2AA5Vw3FJoSjRomb3+EBc5cc/k+Gz3gShUw/GYk4vzu/5ksDJvgbMdrvPNXkBpxFTTJJgDCfgwoi/h+IgmgPGxLPC9Yn5BDEOahy6PmivfjONU4qCWFj8L2BdruHHDFjzhx8lW2yxw== 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=YILt5b8IhusTHX1eols8ourrfeWKeJrbiTRA40g1Bw8=; b=DV0Rdg8aRFbz4fG3zIRTeLdrNl151SQIs3UgEvSjoTYQWFSWwY/a361NAic8IXMJODJa0mNpCdW2Rwi+S5v/N+8uBI8pSTobmL3HrbWBbWxP92i9zElJvjhc4gPHuLc1CBibrAQsp71wjrkR/aDmjTidcm5roonABDTODdvec7VieOmolkudg2Aai2f1KH4IS5BIDy4DkL/244HIDJsX+XXL6fCeOYTDt8gWwtR8W5NnmapyzYgD82LURC+A2qiAqW48SMqAf5srv+ul1qWshJ15jMUXy+7/QBGvfRYk8GJTK31sWBGHdkBpCZWbtjhyYTOKCw4XyPIgJANGuZAkig== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:37 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:28 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [NQxuSaWx29sv3x1OIX4PL4BBerv/duyM] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a35b7af3-0c12-4806-46cd-08d9851fc66e X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL387mJJPv+D1gZZJNbM3QQ+78WSPiJS3Ga1+a6sIplaPeYe1TvPnctTrVhRX1e7TdEepDQV3Jc82ubqfdNk3Yw1eSDKcdzqMaS9s9Bscl/BJME9caGT1jCJaWaJ6qELVY/NH9jJIcniukJ1S9Q1wFuoO1VxZ78Owo9C9sQMiZ1iVTs4Nm84bVlejR5CPRa9IP4FURVFg47VsJioNXxXsXodqWBNrEwZsmilvgIGiEZuGrwx11Z+Lcngi2bZtfHG6OlFl9tISAh51accoIgVL9CXD7UzkPYFrOc7LbQ+uQvzo/thW1+GJ/dTw6Fu225Vre+dI7SBJBt6y/i5bT/Wbi+3Ubsl/gLLyTlhXUfQ0JVOiWyGPbmHXe+psfIxcHD8CFN0wTQFiBlDPGvio3ac8p2aEh1YR7UFkUo7EdHS/F2mR2oSrzAAX08MCv+++Z1MUxwk6y8UOIs03vvsG7YS/FoqAkCy2cBNUauf7VpQFHQ58vSgjkKOxv3+VbdNMDm7KQmqa0fb1h3YF8YpH+OLnPH2fePJVA06fpgsbHj6fX+Pmms0Iwi7EN52wbXpwUfido6M98jj0CDEGqWxk1q6y+/OelDk6wsyNWGA1AkbMtN2qm2P4VSLJcOUIv1A3ee0ejWjLGWec6iOut7RTWV19EnCA6/RlsJuOlE3P5XaxL7IKpVCM3YubfjPjTto2MO2xNyk/SdOOzBzA== X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AVZfH68rcuoW7n9DibSJlRw4BqAwUBiAG3bPb17Zl6D+AIACgKUxaIHOBAmpuN+1Q9EQA7xf9v8yoZ9vaFVuIRWJCgrMT4zFY40veVmgpBwkYMwZqpLXzHiIbL/Y5cK03sDRDfMWQbuwYL78hlN2PezCQPR1OcbbTI8yOV2cvvD2KP2l1AS15fQWMS1LL0xGickUqByI/N0Dazy4eoRa0XoeoDgsAAGXTn8HJcPu4Zm51vC7l9njF3UCtLURBOclUhIrDdxfJf2bhBdApFAzC4Q3dG4kxe1izJoBMbcEEoMO8syjVLktdER9JDZDDeNORaasZksSJzn+DphQuD0Jee5FdyghX4EQPMT6Wn7MlfOCZq7dlRwyaYxyoGM71Vx4WufWOFQjEfVGJhBcWKBPL4fxtoEuSG2awrdTH4p5EJ5jofIHGD3U88a2Q1Ul4qzv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: t4GdAZW7wNUpPVmC2Kx3x0/mpQZVDaBINkk6qMqOxP8D1ODQFTWPqKk576vBWrcisE+ywZkDE7Swy6d5fy740T2mczTp7nBE/tIAGi3oa7cNDYgqWzmSEEtieXduofXGe2xGGd9XLspzXgNZcJPZog== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a35b7af3-0c12-4806-46cd-08d9851fc66e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:37.1522 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 11/20] avformat/subtitles: Honour ff_subtitles_read_line() documentation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YyMIblFHZlNI It claims to always zero-terminate its buffer like snprintf(), yet it does it not on EOF. Because of this the mcc demuxer used uninitialized values when reading an empty input file. Signed-off-by: Andreas Rheinhardt --- libavformat/subtitles.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c index c6701c6a60..3ba5e2b217 100644 --- a/libavformat/subtitles.c +++ b/libavformat/subtitles.c @@ -437,6 +437,7 @@ ptrdiff_t ff_subtitles_read_line(FFTextReader *tr, char *buf, size_t size) size_t cur = 0; if (!size) return 0; + buf[0] = '\0'; while (cur + 1 < size) { unsigned char c = ff_text_r8(tr); if (!c) From patchwork Fri Oct 1 21:08:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30864 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2089257iob; Fri, 1 Oct 2021 14:10:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzKozijH8EflaXhp6fmLQDlqDY0/JtIbT+Rvrh/IypkbF77QxZCGDFYEtMYhwBD7RFRzXX X-Received: by 2002:a17:906:30d0:: with SMTP id b16mr86252ejb.495.1633122657118; Fri, 01 Oct 2021 14:10:57 -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 gn9si10122265ejc.550.2021.10.01.14.10.56; Fri, 01 Oct 2021 14:10:57 -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=Xm24HNnB; 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 878CD68A9DB; Sat, 2 Oct 2021 00:09:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068077.outbound.protection.outlook.com [40.92.68.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7285168A994 for ; Sat, 2 Oct 2021 00:09:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DMRnOozy2qipgzuv7I7+DTLUclAdiyI3SxWIvh+HH8FJTdFdUNGTL3dEQzS2OorEgaDrSISneEP4OhhZ47abjE89cjE1ZFEw7dZx9uRYvVzLltLbJZCOu98qCxgT4MGfYczpGFHiq/jk4y9HbvSCodCcERFpAXaOsFMHBJBhPmNdN58QDsx4W1eV2YDT5cJSnQoGh+gog35T7rivQPzcOa3BsDSwegQtIqJ5U9b0R/8riWR2f3yxz8eoBSeZxyv1aYHe0KDXDRmTOIFHCTWYd93KnFnIAmmZBQoIwz+CqMxmOjR5q92mj86WNH0ntAgvsQkVVSqHEcZzHaBQohz4Zg== 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=9ZIfSh2zSjI4xRGWeBPmPJtDNHpHNlGbnBnBEO/mQ0E=; b=fiwsgtcSG/6PjnnSyhBzW1GG0x+/ia6M71HfoI5lcLXEDzNnKhJZ0DlisdyUN/l4IyIHz34Npi2FV1vecJFb5HNyIkLQ4ZoxO+3BYcRFZNL8bTSiEPD0/3qp+dvH90/U5kLQ+Y2QFybmHqhXNrNCFTfaxFUHYcM1jYAHcCGlLDkpHs5AJxOIIyVjWnG5857GPwGxZpAwGR1oIK4SG/v9JBok7nwdHXy8VfJFqUzs1zCI9jiP0q74MuKa2e4ORQCeijnsc0xiSIBct4CehkZ4o172/JW77Y/JxJxYEUk7VuwnkKPVZMkZB6NK667mZxoMopUORwvk5P2mz9pvZfczKA== 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=9ZIfSh2zSjI4xRGWeBPmPJtDNHpHNlGbnBnBEO/mQ0E=; b=Xm24HNnBZzf885JeXBUT+2gP8jmKRl/W3GBIb5LcrJBsH+dgH7QLxDQnHwni3O/WLZqjZ1D9p9QxZep/lUiV2J0POl/YSufQmT8kwxuCv9GgyVLZw29WupA7e/mHzZ94u29P0Hb6m+1jO+VQXqHOCKZnpAbp/+dyMrmWxvM8hhI7ee4uexum7pCZmDTEX8XBVTRXfFKXzFa1LsClpI3ZeiP2KLLxYQipJtqybmZ7ytdEywEwGhXo+e7qLm4aRHMISZpvWdzorUyO1Z55KHRoCaS5ZoCtl5sSNTXIUAk0cbddGGFTcN4/LSM0o3jZIvEuZI6toKuFuKGmCE4krbOcig== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:41 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:29 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [xCjzKUn9gP8kclbGV1t16veHmwlT7jzR] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ef766dc0-0741-4ff4-e8c0-08d9851fc8e4 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTgZdhvd8QKnLjC/Dfe6SG9vNYr2gH5jphaMn9fZzkfUH1GA97gmKZydzrYTWDsP+D4fznPMaxFXiLdEGdEHY0ptiI42469Y8g0YXRXdDkDFKOfMz3VqdOT2KDjvTY7OWV7QAqCzHtRsqKZeskYKYfitYSox576ELSI3/U/lEt80CRnbj+hbHJRkKvVngzOjBw7wIDGVxN/cKIeJSXV6COhKZEL3MXjpiWfMwhFCBx3jvDHI3bnGdswrwnUUNpV1yINkuNqCWw75qAejHT6ja5/c5oQ1lBZoGXPMfV5TWZ7JWCN+MR/JHsWbo81ixGDDlOQ8H5ha13rvrHpLUGhealh20dunXSV9asMfnE1hUmyZKxiDbU15k9LctRzopoteRSAjF7iMjwpPLv1f9hAkhw372NQ5+nK2ELkCiGD4OpjnR+wqrqeIhICHx3+qUIZNWqFPRPSbk34JZlAwJASFzuCa85qUg8NlJNkDYagupCx8SYgJ+bLlOXO6dUPNGVTIhdjnZRkuNvhIAz8EiZy8u27FGS0DNxzy+m4JZCfHCXeAmBOSTMWXBdM51V+NBzqBmZVmPp54FSuswmLo1zUjoY37W+YH+HY0OOUNWHUfCGqD3lA/l6U2NXPUiaGkwksbwja5CKLhs9MVUFND02hRUNphK5mn2hOzNhvR0zm+DctOa+05MMxLPFgEyYqf4gooLZUpTsoaox+v9db1G6FkIz3ss2Z2dJCJ/tQPrPvMiAJWs/O6FKDG4AcC8wyJHLbJGk= X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Whhx/t+HXvUyR+uDXNaKwJWpMpwX9/0YhLaKLfgly3O6V7B7DLjhkMBmzMkoOZ9kkzOPkv2kKddrd4KzYxLT/xlMY7vqEsNXQJn/r2nUi7BEUpmaQeyPP8RQkPxM54ISITKBfYT/3MemII+p5jnG3TpmweJ4R7lsJQeTzi9gb5W/QXdyMgLJgsWn3S30S6d22UWYKX46MR7lHO0BKA3rPZ5mUjG544RBFzY0YC+TdIKQo93HBlhUMDC0wSnYt3KZUttDOQ7ZSqHDuB233a6ZPrhMEmGL/os80VVGBgTGUdisGJy8eP2Kaq2esz6zE3y5Qna0mgozNj6mkJGVJckPvV6fUVY7cmePI5vpDL6VeW+oOqRCxkQvbrno3LMObFpmmh1zUafFJOUpyQGTye7fKQqj6+vEiRIqRpiPHK+Xc9hvJDSuwePJoDHqZw1GH8BP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b9yRGnNNF6ufU9E/kWenAe6jnCfmq/4akyx2epmxLn94+Axak81kZZV+spB/PParj0Qp9xPHUHQldQhmXcLWNY+vKzOAJXNIy0KqqLAj9pT29ISkcoWlY9jWzXUqHjpGDleiASJPr2ZIouiNVdEqbA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef766dc0-0741-4ff4-e8c0-08d9851fc8e4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:41.2642 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 12/20] avformat/(lrc|scc)enc: Use avio_w8() to write a single char 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: vjUjlqRMfQ+P Signed-off-by: Andreas Rheinhardt --- libavformat/lrcenc.c | 2 +- libavformat/sccenc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/lrcenc.c b/libavformat/lrcenc.c index 5d107cd49a..0de0bb18f4 100644 --- a/libavformat/lrcenc.c +++ b/libavformat/lrcenc.c @@ -79,7 +79,7 @@ static int lrc_write_header(AVFormatContext *s) avio_printf(s->pb, "[%s:%s]\n", metadata_item->key, metadata_item->value); } - avio_printf(s->pb, "\n"); + avio_w8(s->pb, '\n'); return 0; } diff --git a/libavformat/sccenc.c b/libavformat/sccenc.c index a40d84cb4e..c8c4d097e4 100644 --- a/libavformat/sccenc.c +++ b/libavformat/sccenc.c @@ -94,12 +94,12 @@ static int scc_write_packet(AVFormatContext *avf, AVPacket *pkt) scc->inside = 1; } if (scc->n > 0) - avio_printf(avf->pb, " "); + avio_w8(avf->pb, ' '); avio_printf(avf->pb, "%02x%02x", pkt->data[i + 1], pkt->data[i + 2]); scc->n++; } if (scc->inside && (scc->prev_h != h || scc->prev_m != m || scc->prev_s != s || scc->prev_f != f)) { - avio_printf(avf->pb, "\n"); + avio_w8(avf->pb, '\n'); scc->n = 0; scc->inside = 0; } From patchwork Fri Oct 1 21:08:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30871 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2089389iob; Fri, 1 Oct 2021 14:11:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykD0gP3tSL/lfml/sZobJ+5aXkIsOM4Qb5GRlhKdj/ebIchZPb+zL1UjX1RU7tA1RfJxud X-Received: by 2002:a05:6402:50cc:: with SMTP id h12mr347673edb.112.1633122669527; Fri, 01 Oct 2021 14: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 x42si285119edy.427.2021.10.01.14.11.09; Fri, 01 Oct 2021 14: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="hR06WFM/"; 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 7141468A9C4; Sat, 2 Oct 2021 00:09:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068078.outbound.protection.outlook.com [40.92.68.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9998C68A9C1 for ; Sat, 2 Oct 2021 00:09:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BPjDgRJkRp+KMkipztHggdDlXv8MUvp6RzYs0lRBxFVEXSgWdvJAZ3MtuETiieIq9U2hgR9j2AgZzSDbVPnnW7W2+o8TtZPycuti/7aKPD/cf+Kn5ctoAM8/h4ZlhPxGJGWAPNuY69McgRyixVSmJDD+Br/+BlNEwQuzHsq/oxeOcInw79uq1LyJ1uGJC/sGFhrlrGFcrZWMDWHpmyQ+rfdzj8V0cLEXYmqBifE52uVrcK9sMhxiNYJnv3WtOMEqnMHCEtArH/p9zHo1X1e9jUGnAI8C2jusCrEJ/0eiz2OGkMGeR6M2BUwe+qyCBDZKAuYBDfyxvG5tWL8i+Lj/3w== 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=OS/3TpgBS4q9ohtYDSlDO6Q4kI+1745GcSjUaL9d8hc=; b=Z9OqpeQdxURyAHHv6Mrw9LD+NoWn65rANrxegIRDe5e6nem0QihMLXkO5DYvl1ak+q5H8BAh1SQD8FRw4k/cwZq64I0qpZtHUh/zessxZTRqHil7EB/oVhhwQD7S+TtuqZ2FNEZpi8vLCHq1fYk2Bjm/hvaDL3A/pKAIkrugdrTqBxGovoObiW4Mw/X8B+AkYZmI33jK7wieT1GxmbHOBwH+F8rQOiE9P6BVzeHlxjDy605R9LfJhynBHG1Wi3wfhppHJx5fPUl86+zg12Y8iidNVBjiJmKuozp+A7D6BfwypIkG8BeDGL8NO/is1SHe0ccq6v9goi1zfJWrjvuPwQ== 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=OS/3TpgBS4q9ohtYDSlDO6Q4kI+1745GcSjUaL9d8hc=; b=hR06WFM/rm/yqwHlWqqfwU8yeGhLucDQjkW3jYg/Ezx6ky6yRXSV91pW6FTlo96MEus4glK1AwcweS+9GGAvJe2b/oTWGier+1fNso++6b3CfzbnqApjZwSaRW+7lUV3VpybTQNIWus/AsAG1CsCVIOM8qNmg7zCfuDPGwXwpboBc7raPMjAsLajlpuknSbQDe5kxsJAKeQLJA7m41pn5AkBRAccD2yChbDGa6pyCVWVC8tPoWhMekiic6P48Utzy5h79goL1PWPe5T4MPvoG3/cNug/nOiZCHGWH6wqURs61KEBEYZ3r9EneJ/NtKxl2VRua1hu3POpkb6v1Sxwfg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:45 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:30 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [CqsZOc7eI/ttc9A6oVghupm+tnw5/GmQ] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b0e21aa9-f930-42a8-faed-08d9851fcb3e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTgZdhvd8QKnLjC/Dfe6SG9g2cmkr7FYGLG5/fU3Rr75c6bkT/g3Lios44wenLqxqKzIK+1gzUbedoxVWbBcNE5sK5Q/RPVHik31Xx4Oue1PRhyxnuYppAVBLoWE2IM6F15+3V2QBtnhB4da3IJI0pY6R/LzbZElwEnT6bPG2z1ZuKECo/u34ItxKkRqBInX1ad4v7rADKM+9KClFpTepDwKqkRziXPwyDHCR69w7lCcaOvznOG94H//v3h91JjDz0rOLuqC59ypYBKSrMbyxr0U3BCwHdaUQ19gXKsjvQ9UujEy7fgnBH2HMKxAv47BR1drQGmBwCOeLAYrDbuj53qcfKzKWIfxk03nWvwxS0cBsHJNjol+nXpwq+nJtqtHnORoh+QboKZkwgU0y2joRi+Dzpp+xZtPTPLiArvPNhoKMYyb72kk3ckKO7WyT12URfwavGNPj0whSV5YhNkNr4x2kjy69qVVQC7D/ntAKyRvAl0inJ5ns277KprMF62Tsbo2NrHdj0larMb3wdB5kflsfjruNw38U7c88iAjyAgjBZwiI4tGvznMPjSIjth2Wd6rFdS8q9vFvb1LUERTrjomCH2N4YjyNrppdAUQtMt8ciUe6ywfvMXQQz8WtMeipCY5wmx8DoMKZmxoVB1BAlbZjCNyE6vjCxUB9Hx7qEZ1+yOHYoydf7iFnfxpkGcs5LJoBsCuCjP+5O5EvQLq69cKPiU5VTK12YyOOrGB8gan7JgVeKLA8AjLLNbx1RuRjU= X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4YmHKy2vKVvhBd/n1E1XfNr/0QRO9W1ybImM4eh4eDbyzMdlqisshD8Lw93iYPGxRRgH6+PVpHolY9dSnI4/kgtNkOmhfyZjpzfCNw7HcAAguwbneGIFRAptnD8WSVNww/Ns5xDTBaiJWLkHd+ndlxUz8fAPaPxYBUN62KhXWnhSObV5N8RRGgqyWHLzmUDYFF9S1vlnVB153I5fzyP10vvJeh6535qjJlMCGtFq9d3JOXJcXG+W4Va7h0B9/22vtuuxdozJeMKD+qQjneujzXUzM90AUWMwsD+FNBJRybI1An4OlBQlktPOuLVPOcrz/S3iogMb8A4dXSlPh1arQKNel4ixHj2OMSfRsoPoZ5PcVtq3AqqKCWVHNA64QdDuGuchLd8I2wlJv59GRXVz4bBYMDccqAR53mI0whU5GyTMateyJJedMlnpT98O0hlN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CKCUVY0pJn/Gcs3WpWo0KiRLls1RSaxXQjUU34oisiXkKmxcKGSyS32K9Q6IAST2HEaVtdtihG0Zs35kebTMs+LXMiAdUOM8LKDz9oQBNxBX1DO+Z/xQ8/s9VXZ8DfT5PnX9ozT7SQFbE4uu99Kp6A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0e21aa9-f930-42a8-faed-08d9851fcb3e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:45.1750 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 13/20] avformat/allformats: Fix data race when accessing devices lists 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: EEk/o+MV4M6L Up until now setting the input and output devices lists is guarded by a mutex. This prevents data races emanating from multiple concurrent calls to avpriv_register_devices() (triggered by multiple concurrent calls to avdevice_register_all()). Yet reading the lists pointers was done without any lock and with nonatomic variables. This means that there are data races in case of concurrent calls to av_(de)muxer_iterate() and avdevice_register_all() (but only if the iteration in av_(de)muxer_iterate exhausts the non-device (de)muxers). This commit fixes this by putting said pointers into atomic objects. Due to the unavailability of _Atomic the object is an atomic_uintptr, leading to ugly casts. Switching to atomics also allowed to remove the mutex currently used in avpriv_register_devices(). Signed-off-by: Andreas Rheinhardt --- libavformat/allformats.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 5471f7c16f..cadaf057fc 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/thread.h" +#include #include "libavformat/internal.h" #include "avformat.h" @@ -534,18 +534,20 @@ extern const AVInputFormat ff_vapoursynth_demuxer; #include "libavformat/muxer_list.c" #include "libavformat/demuxer_list.c" -static const AVInputFormat * const *indev_list = NULL; -static const AVOutputFormat * const *outdev_list = NULL; +static atomic_uintptr_t indev_list_intptr = ATOMIC_VAR_INIT(0); +static atomic_uintptr_t outdev_list_intptr = ATOMIC_VAR_INIT(0); const AVOutputFormat *av_muxer_iterate(void **opaque) { static const uintptr_t size = sizeof(muxer_list)/sizeof(muxer_list[0]) - 1; uintptr_t i = (uintptr_t)*opaque; const AVOutputFormat *f = NULL; + uintptr_t tmp; if (i < size) { f = muxer_list[i]; - } else if (outdev_list) { + } else if (tmp = atomic_load_explicit(&outdev_list_intptr, memory_order_relaxed)) { + const AVOutputFormat *const *outdev_list = (const AVOutputFormat *const *)tmp; f = outdev_list[i - size]; } @@ -559,10 +561,12 @@ const AVInputFormat *av_demuxer_iterate(void **opaque) static const uintptr_t size = sizeof(demuxer_list)/sizeof(demuxer_list[0]) - 1; uintptr_t i = (uintptr_t)*opaque; const AVInputFormat *f = NULL; + uintptr_t tmp; if (i < size) { f = demuxer_list[i]; - } else if (indev_list) { + } else if (tmp = atomic_load_explicit(&indev_list_intptr, memory_order_relaxed)) { + const AVInputFormat *const *indev_list = (const AVInputFormat *const *)tmp; f = indev_list[i - size]; } @@ -571,12 +575,8 @@ const AVInputFormat *av_demuxer_iterate(void **opaque) return f; } -static AVMutex avpriv_register_devices_mutex = AV_MUTEX_INITIALIZER; - void avpriv_register_devices(const AVOutputFormat * const o[], const AVInputFormat * const i[]) { - ff_mutex_lock(&avpriv_register_devices_mutex); - outdev_list = o; - indev_list = i; - ff_mutex_unlock(&avpriv_register_devices_mutex); + atomic_store_explicit(&outdev_list_intptr, (uintptr_t)o, memory_order_relaxed); + atomic_store_explicit(&indev_list_intptr, (uintptr_t)i, memory_order_relaxed); } From patchwork Fri Oct 1 21:08:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30878 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2089566iob; Fri, 1 Oct 2021 14:11:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7QA5/TFVLdK3GMyJETAQR08Jydke4KsRIs7F+k6ePvU/Kenikpu+02myC6W8k16d1JNB4 X-Received: by 2002:a05:6402:1545:: with SMTP id p5mr352851edx.110.1633122685017; Fri, 01 Oct 2021 14:11:25 -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 sb26si4606873ejb.542.2021.10.01.14.11.22; Fri, 01 Oct 2021 14:11:25 -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=UMf48K2n; 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 9399168A9C0; Sat, 2 Oct 2021 00:09:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068048.outbound.protection.outlook.com [40.92.68.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F144068A9C0 for ; Sat, 2 Oct 2021 00:09:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cS4jZtsHWiZzFLeWV2zjIgvscY0ECnsz5u9a8QGr14n7FjhbYgXTbyIj1PZt6Qft3vxzGkMgfX/UF4QYfo23Mx5tDvvxd0WzlSXxulvMqmlpM4pqz46OT1QbsdPrRLwMA4/4KCay4BLVUj9na5jC/Q+2t2UHNQGQzLXEutNFoUW7TDXXoN300va31fp8u/NKfBogL3D5u+1sYhAmbI5u5/FwZV0V6bASrT5EDNRUrMJc0odU1MjbbIxQNU6Ki40t9ks3v/ugZwSGtIBgySAEbuDTDKJZAPgugrx2igSnq+9shFPiDuv54t3t7XjvBIGORucFSsFbhLGGVgtTXuqXvQ== 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=QZiKJWF9BKHAMin7JlJp2VhWoIigaMx9TZeTOVijXOE=; b=HfbiRG3WZZ3x52Z21kk38vNj5Bc8+KPytUPVEEm6BAwyQn7iEIkrxZJUAOvWQ6qR6E+2gEA9wg3I6N04m7VAy2ExpRklmXATZ0TnU8DUuFJBXL0oOOYMcCZ/4wYglj6rDMmZTNPZxRNN2WFGXK3uPgGOhw/ON1nDj3dufbw4rDrj10tpprMp1vpFlARmLhNi/S0NyPU28VtWIPsy6XKHD/aPn9oFl2apj1BbKcQX+ICMRf9iPtV0xvcc/HwMoqyUxANUtQhaF9U6JLvp/xImx6fZjim2GWO3yxhw93SIm1Izvlrr0VPFgmkQRinfgafEom8o2TvEkGRjXc2wLfnbgw== 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=QZiKJWF9BKHAMin7JlJp2VhWoIigaMx9TZeTOVijXOE=; b=UMf48K2n9UPhMh2r4PKumHKodSTDEfv/OWz2UjIHQ002YwIKHrkQclYKtNMnlrKgmf7g9Z9/wcSoB2j4bs9d/8Q2IMFiObDflk2oo2Kzi1LMKYMl8ZaZn1UY2q+kaa1ZXmW4R4jpM0WDM4KJMMV8aglEajsAaEYqCl0sw3DsEOv95e2HgQCOwZWOPZEaHFtCLEv1f8gb4FyOsM7bTqmqObHqczojnt9t+5wg21URKQqRGNh6js4crTi/+nel9Bdwl+5OmyFD/79/xVp6cQOqE9Oitn30zQGeXa+eXJqvQRXGkB+lQT0MKHjgXmMpOlZUextNXwjTG9SR0KVWszgikw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:47 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:31 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [HHnrf0i2g03x8KQI2NvgM6rLl5MHr6+N] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2c5565d6-4f8e-4152-9dd3-08d9851fcc91 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL387mJJPv+D1gZZJNbM3QQKOZ5ZZdJx2ZZkuhTjRduC5jq27MiFVyVkYCktnd7EBsiM592/twem/mVzagkZWniS8TlylzCdEo9sekot3l0ybowK+Qm6tl/gfFd/pNPq/IXbxoD44ehr2N9O9ZfkdMHU0+hPxN9z0S34OxLL1ji8IZ4HtoXQOavFTPplNZ59zI/C4HfNyGQFCCByVr2erXbgy2t/z8DK4w9h3xnZycdO9+xFQ1YVidxYWsdJIQxi+Wy4wn8t0u3lBumD/45wxwlfJ0SeADgsLUHtCHtVYTaQiyijCByrEyJu/Dfl7qPPRGtFhjgq49OrcKaM1QaJLtYuDRY0xxkVNoZoSDPXieh7Nt20OR26iTvNmH6nP+7CFEXud20FSTnHdVNz82y2vvcL9q9O58jwnzIS5qlFlMLpNDz1sivUzb2R0TRRsP4tgB77zOeVl8lWwxeIWutLyZM/DNVS3ge05M5KQUew6lVBXie3K4YsTW3tMIXOCl4RTwN4Y8tic3A743Iyni+9UQfIddK0nWpKMLkioafDxqWbSjveQgNZuuAv9mIV9TKI8tWC6ehHVrqcsk2rIDfAt89WnN61Av8/nsHiQp5TX/SYOjpZdyOkx+l9opSXv7beVPFHp2pan9Fjhv1JBgwSJ7mrWo/DgRjqwvCySWV1YD2TSWcANJifN1mLMYwDYCA5aayrxd4/7oloQ== X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FO2ZzqlAhV/TlrVPMg/dyU9fPN/VyeRh17/54pRrHlISIh4GZBHmEdaICumpKcu8uRDf9LGZkai9jgg42633e+0pJyfykAkqIomnuXEublNKvxmnMOxAqt69ZutHyOYKT31XsNr8hRllbY0V34ze6jfNXy0HPXZLJUQmT/97M96vvDIpYgFjSDlg9PJZf6uc7hCVn3na11EQ8C+gmnYn1nfCV8IAhU0mF4yEkh1+azd959ZIJkE+PjTzecRpusf++WG4hOGHS5ojCjftqtUXLYALbmEViKRCy7jqEdzd+A05lkigpQ+MSRrVCJgZgZOoyxWyDcybscTdyaRxJcdGj0gcOtDqWIutJYq9n2RCOkyK44XJcynZZcNOn9tafcuogFdO0jpjnA7dmpea6RH0xWoZtBGxPlqjelCSh7AtxKNEPII6Pb8iT1FrWxFd4GrS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uzHDsmYLAuRBjUG84N71nVI5H45iksBJReFvsdMMy3+CcUzMBQQWmxNyDPmoy9NkI+Zspi5e1fMkXJRRqWrvysrPaepxqepzZbSNwQRWBtfn+669cHAZiOHpvRgAKYE0dzNraOxPsArKl9Cr5oqyng== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c5565d6-4f8e-4152-9dd3-08d9851fcc91 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:47.4879 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 14/20] tests/fate-run: Set bitexact flag for output, too 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: fEs+vxT4rbXv Signed-off-by: Andreas Rheinhardt --- One could also do this more generically in the ffmpeg function. tests/fate-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index bc1efa22d7..a16ce28a45 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -178,7 +178,7 @@ pcm(){ fmtstdout(){ fmt=$1 shift 1 - ffmpeg -bitexact "$@" -f $fmt - + ffmpeg -bitexact "$@" -bitexact -f $fmt - } enc_dec_pcm(){ From patchwork Fri Oct 1 21:08: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: 30876 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2089670iob; Fri, 1 Oct 2021 14:11:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrxICRJbE9QmfvNJp81PCvuBhOwb1Gn0ktXYDIZwicPJ13YrF+SctBMkyf57zmhyMz3Fis X-Received: by 2002:aa7:d78e:: with SMTP id s14mr276816edq.171.1633122696629; Fri, 01 Oct 2021 14:11:36 -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 d15si7526991edj.560.2021.10.01.14.11.36; Fri, 01 Oct 2021 14:11:36 -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=i1nd6b0x; 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 A976C68AA4B; Sat, 2 Oct 2021 00:09:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068094.outbound.protection.outlook.com [40.92.68.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A35F68AA24 for ; Sat, 2 Oct 2021 00:09:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nWtVLipZcHi+zFwG+38Kc7OvAD0nUxzwqAQ789+iZJgJF7iKpNcf8tuMSaRrLUVpsw5O5om4LZ5nSwqfb2XfKhg97fHbqcKNdJbbvStFq1+NT2bJhcnTzY3Ae8lMpmkcMhciaZJMXR2PTS8v5wHG8IwkBmCUNQQx6ujGH8nsdy18groIlxMO15yvC0ty3ssk79Vhk5c4BRtuFwylHwJdn6Q5ztAqxvsZLcPO+bNocxbrocv5QXNt9lHXivnDhRGUC4aLwLZZlD5l7bQdkX5cIpzW4s+86ik/PWq8Umn+6aZl8X47WOD9pq17x5JaPOEmITnZxayWF8QZGIqbP1t+BA== 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=+VF5gfQFraDCRdkHnsl/OX/q5u73AqQ0ciynz2jiGXk=; b=bB3fCBLeC+PkfIIf6Tii3ZZCRJ8ImvAHwJueZWjohRcvGoxxvwNc9E9DMpszvDbu1+89fHA9Qp70YHOSZVk3EbNAWY7dg9TI8DV6qcFgeu91p/DX+jXKltKNYBEoYe9AOvwFbkX92UiHckIv/JYusoR9hS6tveHLNXZf3vCpNJB4aBdPdzA1VvAZ0hpTeCPPkGvolVNpOedEV2vk9r5aawqAud4JAgFcJFymd0mkUoFXKPUk7LXoTiv+TfT8z6F34nvsgbikJT6XlbXktSMCuXYPe4+rzvKVie7odWQBniS9M/LBrv0LkajBwIU1eZhOmAUm1DfGHNBd9k85vR7qag== 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=+VF5gfQFraDCRdkHnsl/OX/q5u73AqQ0ciynz2jiGXk=; b=i1nd6b0xWqB9V+YyW8uFMmLrn1jcL5LbLKTXp85sHDU6W36ke/a35/UA0DqfW4KYbYL6q/K0q+saQAmOA54JaLNeBRXaTlypZEey3u2ZGERcDvME/nVUNsQEF7Tco/IJ0dFc5UV2awQVr3uG3zALtwG/sIflNktqrCe9q7EsWpEu/+zfHj3Cyzla5GbBKFnOo5kAo2cN9cYsdqgyoTHMmESylXq00YDTeG7S6cXMDdEOMV5CDzVlENV7FSCRg41tXhaMmSJ2IfvyDz0LfaRw6uIKraeqy9K4L50IwO/qNvwmMZwkQDTmj/9HrhMGV/8ya9LVPPPP5syG3d0vUnotWg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:51 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:32 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [GkYCNWO0koz/zzttBIc3wyyva9vjumx7] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e7dbe622-b53b-41ed-a0bb-08d9851fceb3 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVM2asYY12qjM1/Eg4mHSQy5tV0qEqDmspJ9xXHYDJe5XdJL3PDiN2T2oUJgq9ui1ieI4C7Q9rEjEUfnT/R6Qj4lCXwEhTlH4W3swgR/tsCY0VlVzu0YwWEtYJNcBx00djaxn2IVbp7FTgeTVcoIn/hgJt0IjMv/EQF03viUfZ42d8Y/y6503bUlMaOSWnErkVe9j+hl0DiJ2KSTNb67ce3DngHSaT4ccxXWGp2Dw6dpZpUI4sGTNOSmZafSPWlSXrpT34tgQo6wajbVAIR5Ag2jqZrFC3HSzIfwy3DYoNJ8WM4HaVSK8KuXuS03z3CHukkFj2yR6LoLAEY/+JxHWcAQ4TMufBsZ/lHlO62EJZvK0gemlJb/dO+6RfaZ0InuaxAs5sgdI6lj/LFCgsK8Dh0rxZb7mmi68C+VZfJ1wHv4iwwtcIA/1EF7OsfiqT4vbpDepKxHMMidbg3l1ezxFcD7arxXTRxQH7dgnCkKwwidJxy3kZ9Qqeviir54/l0eweMLHABuSFekn4haGcV27+xfLD6frYyfFbQPK0wiPHA4GkRbqQPebv6WEc8BYxO3gi4G3HcBkqQpflLQh/mQthxf1gSrs6YYu9yqT9Aktv/ES1acs/KBIYqUFE94VIT/Zz8YLLShLu9zm3oukYIWxcGoVv57pceyP1HMzXgnRzp1XkF7LMSRJJhzxysaNIepEWkwGk0QqW/C4Uk6taz5d52DBgnkKwlRcI= X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JC47XsbwVG8jHJGmLKjX/wBETqqAgMjywnnoRajdNt8jY9LsEUZ5jKrwmG4etfDbh1x90hWXO/27i0ph/fU9ulnfPwO5yrWpPAXbNEf2wlQ3yFKqzREbQ4ecQQJVUbqBRrtm0DbefpKBpufQBCoDHxVO6qaqE37xBL+wA08rNo3VkZUDiYt1bpFvQGyiMkJAEtsb+O/fk2/w9y6De6MsGbrhE64q7/sG/wIqzugDOD90VTnpo8ykKBcNXjFGBThtvITpZtlnOPZuWJ3bnpSJ/VTl22Z+j6vcitcvmX4JUuxTXCxxJDDCpRrz8vyDoI/sxGTxT7rLTFKnp/gpsI943RMQnMU10z2gBzu0RrB34y/R9hTetsTTz2s1J8Nz99H3oJk2z3PQ5cezrNLuUf1+TS3ZaBd0OeYM9TLXfkWlI20Alcz0YQxo06MeRGkR9Fv8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Axztu8lMlBRj4iV9gtQ+gUkpZdMytVvxVOQ2AFtdFoX+PlPuL90q/CIUrwDBuYs7NAX8ZvKW6+ANs4L/x3l3aBaZ3nuWWc5b7JKfA+da8dl7eKXQkI8RWORenqyYTZ7cWTR2ALZ27OqRJFDY6Px5AQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7dbe622-b53b-41ed-a0bb-08d9851fceb3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:50.9916 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 15/20] fate/subtitles: Add remuxing test for lrc 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: r/OcdCneAmwF It uses the test-lrc.lrc sample which was added years ago, but never used until now. Signed-off-by: Andreas Rheinhardt --- tests/fate/subtitles.mak | 3 +++ tests/ref/fate/sub-lrc-remux | 49 ++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 tests/ref/fate/sub-lrc-remux diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index cd162786d4..2f4c94f366 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -26,6 +26,9 @@ FATE_SUBTITLES-$(call DEMMUX, JACOSUB, JACOSUB) += fate-sub-jacosub-remux fate-sub-jacosub-remux: CMD = transcode jacosub $(TARGET_SAMPLES)/sub/JACOsub_capability_tester.jss jacosub "-map 0 -c copy" "-map 0 -c copy" fate-sub-jacosub-remux: CMP = diff +FATE_SUBTITLES-$(call DEMMUX, LRC, LRC) += fate-sub-lrc-remux +fate-sub-lrc-remux: CMD = fmtstdout lrc -i $(TARGET_SAMPLES)/sub/test-lrc.lrc + FATE_SUBTITLES_ASS-$(call DEMDEC, MICRODVD, MICRODVD) += fate-sub-microdvd fate-sub-microdvd: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MicroDVD_capability_tester.sub diff --git a/tests/ref/fate/sub-lrc-remux b/tests/ref/fate/sub-lrc-remux new file mode 100644 index 0000000000..92d6c30f64 --- /dev/null +++ b/tests/ref/fate/sub-lrc-remux @@ -0,0 +1,49 @@ +[ti:Swansong] +[al:Breadcrumbs] +[ar:Josh Woodward] +[length:04:21] +[by:StarBrilliant] + +[-00:01.02](This is a negative timestamp which should not make program crash) +[00:35.62]I never thought I'd see the day +[00:38.42]I thought that I had finally moved along +[00:43.80]And I had let you go so long ago, so long +[00:49.26]This is not, this is not where I belong +[00:57.38]So I wait for this shallow itch to pass +[01:05.98]And I wait, yeah I wait +[01:12.14]Hey hey, I'm ok +[01:15.18]I don't need this anyway, I'm fine +[01:19.82]What's yours and mine +[01:23.64]Oh oh, I don't know +[01:26.44]What I was ever hoping I would find +[01:31.66]But it's time for me to leave this all behind +[01:35.74] +[01:46.20]I don't regret a single thing +[01:48.98]I couldn't say it didn't feel alright +[01:54.10]But I don't want to stay and I don't want to fight +[01:59.76]All alone, with my foolish appetite +[02:07.94]So I wait for this shallow itch to pass +[02:16.52]And I wait, yeah I wait +[02:22.72]Hey hey, I'm ok +[02:25.68]I don't need this anyway, I'm fine +[02:30.38]What's yours and mine +[02:34.12]Oh oh, I don't know +[02:36.98]What I was ever hoping I would find +[02:42.28]But it's time for me to leave this all behind +[02:45.36]I don't have the heart to give away to you again +[02:51.08]I don't have the stomach for it, no one ever wins +[02:56.70]We had our fun but I have sung this song to you before +[03:01.68]Here's my last refrain +[03:08.05]Hey hey, I'm ok +[03:10.81]I don't need this anyway, I'm fine +[03:15.50]What's yours and mine +[03:19.31]Oh oh, I don't know +[03:22.11]What I was ever hoping I would find +[03:27.34]But it's time for me to leave this all behind +[03:30.81]Hey hey, I'm ok +[03:32.98]I don't need this anyway, I'm fine +[03:38.02]What's yours and mine +[03:41.91]Oh oh, I don't know +[03:44.54]What I was ever hoping I would find +[03:50.04]But it's time for me to leave this all behind +[03:54.82] From patchwork Fri Oct 1 21:08:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30870 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2089839iob; Fri, 1 Oct 2021 14:11:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFLIIG3jJjpRJZQWMDMaRxJ6opHg3ZkV0NHsT5UaATeAaFSOHyXEko4F28ueHmsfQuaRPc X-Received: by 2002:a17:906:14c7:: with SMTP id y7mr123950ejc.123.1633122710581; Fri, 01 Oct 2021 14:11:50 -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 k10si8813535ejk.439.2021.10.01.14.11.50; Fri, 01 Oct 2021 14:11:50 -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=aZUxLVwT; 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 C60B168AA24; Sat, 2 Oct 2021 00:09:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068028.outbound.protection.outlook.com [40.92.68.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4DF168AA24 for ; Sat, 2 Oct 2021 00:09:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LBOcGvp+t5xoWbD2kT9Qbg9q/H82iUCg5gkoWq36/B4MKL4GvpVbyPhiWjcFNL1IF9HY+E331o5CdMuLE8d7XN0CCxSZVqYXWzYfNbWjQyei5Fuy6Vd+GAYFm0qQQ5iAVifY1uqYoOgytsKvZ4eafh4kl/QzgKm4UMVZHaZLWhgrjHElS9YwM8avuwokCA1VifJlkQ+IhcrBfQEoiMsBRWP7ym00bhZMVwRmemZrUsRg4Kd5b6Ig8XNq39B1vFnYcct6OD899nJGqfOV6VCMgWFzfSYkE9l45se6q6JV7nTUmeo5sMHWBT4qH2mVGFuXdQaNfnNui5gBUmMrkmUUhw== 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=1v/h3CW16POzPa0GhFenpw8HcLIIOL1IgB7yZlnUVfw=; b=B+UN3BKglRfNkQ554Kww51yw3IX70gkqVjIunCHtr0feZaEoM4aSI4L1d/Zvo8xXjgQ5n68WOVvRbt5DHa0uvmXd5lAa6b5YMa0jV2iUjf7Id9UuNNU/P925IwCMDtDlPB2Vlc+Q/rwuGXUXfqISckQ0W8d2xUJib1k/+CvQq658yA50DRa3qQE/UGozdoYqMz0WPFFrnoSRE2C7Wpy791aBSbkNJqJo5fj1pV8Xt5Tj/tO/76ej60jDiZB+/mF5MpHug3fHbWSBb2OcsEbC6oLVf+CbSP/SOGtG25fY+c9rTeJjiwIo6hjn0tDhumrbNZtK1inzeLMxuUPC2L+/Ww== 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=1v/h3CW16POzPa0GhFenpw8HcLIIOL1IgB7yZlnUVfw=; b=aZUxLVwT/6ozVJr8XnqwIb6lsHApFX3fIfw+eipB3DAWo5eb2C8NJ++hPPUkPln0+aoB7LxAjDWvJ/R+XAoslvoL5bzwhb2E1SzOfBR56QE3kmNC1QAYvo7rKzQhRIQx/ZZIvBCP33uY000gsCPiRYIXzjrBvZQ6nMOmblB3BxSVf7Hl6qaUcMjE4KrOLEqdXL9IjfsmMCOnGyZ+HnZ2zYklvFKwbgSvkGNhhhwmxIzDIORagUEGnYU1I1uHtEEV1avaN7/mlTxK9XE6+y9gmSLb+q2kMUUFCUpfW/NXF4ZYJBGEHI5WgRBNYvyLpjHvCSfegBzHC5/1ZEOX58IT2A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:53 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:33 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [a8xz8IX1xed6eVCCBxEAie/qDyMszXtT] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0e815c75-7dfb-4a86-316e-08d9851fd024 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTgZdhvd8QKnLjC/Dfe6SG9hjSNX1uABkdALhsXdJ/Ecm8wZXBbOpeQOyROqx/8HBp3vS4Ai920tIt1Pn8SqveMEO0svt7nqqjazjsa+w3i3OQuNIrE1KmAq3cxPQbP+jvqy1iqe43QBIUZqCQhSQfkFPzFCEo3yp2jU98arzhy5uycxOYG65AZEnu46ZRxXfwh35gC86jcPbinkkh3cmjN2mh48TVUlfI5qsxdGbfMgZs5XzilHamXYpVli7GpwRrjfizMOSzUDdcz/rorYWZHbcxGBwwCcyXc6pJZ7XXOhJTuQ8+CGOInPNrJan+FcxrN8H4xlty7qte6DkZr3ZYTRitiRLEZkGFTmz1lhGC/jQhF88k3IQEtE/oIM4s4abpNmSqStuAS0+cjV1og7aVYTB4bqmcYlwto5/vcwfivui0myTO8WD2NUoh9oPWBamkdU/wJHQDoDyeCaiYhVMk+mSU7ApHNQDw2fLHe56gPsJWkffkzTeRHxvd6NNWsh+58S7qDfCsk1EOjEi4h6UAKMqQb/NaZGN0S9NvkD5ss3aObum+xh4yspa9hwwIIrTTSraTCvt9TsPe1wXkn3FweWkUq9Xq78hopmCmzIJ+9RAOh8sPT/inIQYvDcJCGvSgyMEW6Eup37KkwE2l3g/e5pZxQU9GsSyo6B0GzYEbOyWpFNoOnHkNFyKixQxVu0Lxpm26jUx8BTaj3ZiiVWoyqwseCZxIivY3CmZTLW7VejrM8jLeypDYtl1KBijKqhHw= X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6XSyC9znCgcPjro1P13OkiYOweuHBXzcgpKuNw/lS3jWzLYxTmmtNYAg2wLnaWe6jtTKy7XoQGy3vMEy07dlKzk+zfr6bv1ipbFY03FqATqTb6/73R2mgmDAEuJC404aYLGwxAQh/2AIvaGJFKhBM1HXWPiMrhUcSoymKfeqtFf0XKE3vV+loWUdOX5RcZ/MhhZMO0O0f67Il+FuHw9R/CHjtJ9Ys/vRhtvd3QBuTYlgyvuEFbj1ShX1BbTVARTnLPAr94rCjpRd+hVC+ywW0TR5jBaq9lxXTIzHTxZOa1gJfiNUHAt5+3k2zWbRLcMr6OEeJ9RYVEkGpmUAeAz7GeDmLRNVMpLbkfC6o8j3WE7FWABp41Rkij5em8yT5qOLNidhZe+C/jXauUkjB19MjO7EBLtTYAeUBDOfpFVa9wF5kEFumDA+CMTfds+ngC+v X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: A9m/x+w98tqimR2ajLhF9Sqh6MUypZ3Yk+ikNS0v68KPr7mWOYsWmTHaqHxozrdELKhKRkpKSQQoZsKkhIoSvq+LraYK6mmN7qpAcwWlDDKZPrE/irRafv2iXg8MDS+YM9WpsUQC2eXEgC1HmUkgMA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e815c75-7dfb-4a86-316e-08d9851fd024 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:53.4548 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 16/20] fftools/ffmpeg_opt: Remove write-only variable 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: L5xM1XxaPmPE Unused since 6b35a83214f1bc3fb38c9ea9c2cd3676f28709fa (the removal of ffserver). Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_opt.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 1d6d29cfc9..c46a9343e1 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -2205,7 +2205,6 @@ static int open_output_file(OptionsContext *o, const char *filename) InputStream *ist; AVDictionary *unused_opts = NULL; AVDictionaryEntry *e = NULL; - int format_flags = 0; if (o->stop_time != INT64_MAX && o->recording_time != INT64_MAX) { o->stop_time = INT64_MAX; @@ -2250,13 +2249,7 @@ static int open_output_file(OptionsContext *o, const char *filename) oc->interrupt_callback = int_cb; - e = av_dict_get(o->g->format_opts, "fflags", NULL, 0); - if (e) { - const AVOption *o = av_opt_find(oc, "fflags", NULL, 0, 0); - av_opt_eval_flags(oc, o, e->value, &format_flags); - } if (o->bitexact) { - format_flags |= AVFMT_FLAG_BITEXACT; oc->flags |= AVFMT_FLAG_BITEXACT; } From patchwork Fri Oct 1 21:08: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: 30877 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2089961iob; Fri, 1 Oct 2021 14:12:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzL1jEwWRlUMHma8xzhRXD+SisKTLZg6oa5ofk+HhP7P2LkRIHVOhFT4fmSGkLE6JvFa+28 X-Received: by 2002:aa7:dd16:: with SMTP id i22mr293412edv.167.1633122723718; Fri, 01 Oct 2021 14:12:03 -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 t7si10685259edd.36.2021.10.01.14.12.03; Fri, 01 Oct 2021 14:12:03 -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=iK7HgbQU; 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 441FC68AA61; Sat, 2 Oct 2021 00:09:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068087.outbound.protection.outlook.com [40.92.68.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0A8E68AA61 for ; Sat, 2 Oct 2021 00:09:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B22/F5FdvsHp94892zyClkVqmjJ6XgpZJvYESE6f11ji/whQ3a2sx5XekNt13mX1t/9DNsO4G8DeZU5F4k9DjegMZv7vCbGdE4pEdCGdzpIQuN9hmU2z/prxUC039j3wh+13sc3lDvmg5m9fMXtCmGxE6SVYeZ6iBJu0Pp8j4AMK7XZ19yFhxqmpLvniZOSDhHBVS370cUNYT7s/dkfEK3jYlHnY85beK3hUceavoK0zR/xpQu1tEqpHlfj1R/xGrKbL1Mzskvrrbu7jifapdb0nAYZUmsEVIA4FOuP1Hh2/8HikqsMGmQY0kK5O48rk38Rfeu3imGg6ZKi+/WL4yg== 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=8/lJbTqGvPf7rb5kLsHLj3T5VgNCl21P/S+nifY53HU=; b=io4mAFUxfQea9NkE+hIH/5zRcAt8ijJeBqir0qxZ/qHn65pynhjdfZdNsQApNjYLCLu0U7A29C0hlkNbeQYLlgwK5NV4IUjLoaMMVuEOVWO2SCrq9a37F6Wx5vGVgwurHkBM1yVwDAVaSGTTxXGlYg7OKEaq8sp7Kc73FYRCLwT7aQ0jPUj+j8RMt6KRv60tQl+Ooz+Vsc7nZY2qlyeFAlWNbn9n9haBntslUdttFeIwMcPWgxkUpJkCfxpY1QGRK7vQQxc/Dws1noZNQQp1CqXM38DDBPWC/WayYBO5jJjlIlKnJJOXDW4Bn6/nVlMCj023W/ryPgyPmkAALL8TBw== 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=8/lJbTqGvPf7rb5kLsHLj3T5VgNCl21P/S+nifY53HU=; b=iK7HgbQUYq5PgXjJdTTXHSxnnD/ifmew3SEUOpEDeBmgCRYe0FjGkWd566Mi/8a7+kK3HhcuAOcgrby+hzdlNoSmAPWhE9FO6K8W/4sZfP6tm9ROWAwfLuxbXLFxqtFFiX11pC4Cch8oPdO2/8xJRHgsBQuz52gWYrpK0EHPydVtXlt53dt2jLjXZQpmQMS7Q96FJh/z29D5WbJDKx2vensSczoyIDIvsRUQQ0APhffSnYy9cIISp+J/8yaZxiMEwr5Nn59BvNyzJy4M41SPxPhy3ovP4KmY4SFblJ/aNDgam7Dt+eB+KIvQ7NsOTLzoSN7AksHz+mpn+8UM9Wm6YA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:56 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:34 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [M0gfGvJ2J0TxXjeqkeuFrLfNMy31ucDl] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2cadfc7e-017c-4774-5dc0-08d9851fd1e4 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL387mJJPv+D1gZZJNbM3QQqmWIbqmPkeCB9W3GZImzgg1J/99FBvJrulRdUfbVPLZj0uTqd13JSoz6LtuIGibhMs0AmaClNY+sw4eKweqzVdNomaT74FrCEL2MIRLTbAZrLEkPHGlr+IEcO0rqWdWwqabc2HkdIWNAva3Bi+yULTv8RUgOf/7j5XC/3GzhaILyAweh1/A/qblFGaVlyz+62nrEA78ZWMbDH9VnuPbxGebbh0iAFS42BbzDsb5EJXpLZGecYGjNn2d/0gdBDLRqiMWWMZVSi7G3qtSKaAcWTHVb5pRn8YbLNe+ykHuLB3KM+bpP2SqMQzwUdPZnO+/bW9Ce1gbdObf/U3foTLypDaLnhu+hzP0RD5BbqfI5iur2devKX9YdMjEOOjNm/EVD8RyHneVFGo/HAGNELF1HvSqGDy+chL3R2zPrIM+pDGi/JFWVCsgxxDmwNtVJbnEV8eQmafky7Uwg0btJs6kyalu8/aLr7DA6S1am0dFKUAxv8qP7lKkbB4JxymTMBuM3D7EfH7J9MunNZji2sa6A/sqOIXhXtxpuqBuU3yKYqrghVQF3BBwm6/iQWDJDOgON/NqiIuwYm3xDNbOqhdqzNr4T3KFzYe4INtkYRxUy+JpSMGiZK2yedbNV70WWdeAZRTVQjD8QEP4KQyQc73B4BWq6OszwGtNT/s0dIg6utsCbEjnld01ykA== X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6TJTE4L0uf35zvfxpp/4vXix2eCHoqXNlEW7lQ5vY+AdoFXdKfySmHja8JkYiXD8+3FOgCF70m7Cy49xcQguvane7VmT3Lmf8ib48mFAkgQxtPrSYEcm+pNQgEF2gJGvh7WyM3E6cXhOd+auhmK3ukG/njBxkNz68Q/8qeFeIChHS/bolCGdREO4NFWN4fR2glL3TmwbB+t+hw0DZbB2B8g6pfrfJKu3u6y98XNGzdUFptrFTyjIDXw9pNhc/dPH10IButgybrqgMFYcSluEu3ryelp6IHhaYcE96sT+uM6NZEuyBzzB3jxK8Zo49vltxy+G7fTxbcMA5LOU0CsrtVijQwLs3kcAIyd5wC/h15K4QuGHzgo837V0EfCaggbfNEuxyO5o4xE5EF9E9gIXYnlBS87GatgI6iB832FrNd00rXFDAO1/R/FnxG6a6WPg X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ckZj8riHY02fCt43rIz3+HhAt+SzOAiCbx8uxhZk1u2K3Owdrs0ZtWGO1sQ4lnrEQRF83XtLp0BE5kZMx6QDPBbohHwl3/qOcm+jUzHrFkvMOlzHDa2+0aft2sEHkLWzdXkYQwbtl8nwkhIdGG9/jA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2cadfc7e-017c-4774-5dc0-08d9851fd1e4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:56.3561 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 17/20] fate/subtitles: Add scc remux test 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: joi/j2iziZpj Provides coverage for the muxer. Signed-off-by: Andreas Rheinhardt --- tests/fate/subtitles.mak | 3 ++ tests/ref/fate/sub-scc-remux | 65 ++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 tests/ref/fate/sub-scc-remux diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index 2f4c94f366..0c89adb0d1 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -110,6 +110,9 @@ fate-sub-charenc: CMD = fmtstdout ass -sub_charenc cp1251 -i $(TARGET_SAMPLES)/s FATE_SUBTITLES-$(call DEMDEC, SCC, CCAPTION) += fate-sub-scc fate-sub-scc: CMD = fmtstdout ass -ss 57 -i $(TARGET_SAMPLES)/sub/witch.scc +FATE_SUBTITLES-$(call DEMMUX, SCC, SCC) += fate-sub-scc-remux +fate-sub-scc-remux: CMD = fmtstdout scc -i $(TARGET_SAMPLES)/sub/witch.scc -ss 4:00 -map 0 -c copy + FATE_SUBTITLES-$(call ALLYES, MPEGTS_DEMUXER DVBSUB_DECODER DVBSUB_ENCODER) += fate-sub-dvb fate-sub-dvb: CMD = framecrc -i $(TARGET_SAMPLES)/sub/dvbsubtest_filter.ts -map s:0 -c dvbsub diff --git a/tests/ref/fate/sub-scc-remux b/tests/ref/fate/sub-scc-remux new file mode 100644 index 0000000000..e0a8247e4d --- /dev/null +++ b/tests/ref/fate/sub-scc-remux @@ -0,0 +1,65 @@ +Scenarist_SCC V1.0 + +00:00:01:04 9420 9420 94da 94da c2d5 52ce 20c8 4552 20a1 947a 947a 20c2 d552 ce20 c845 5220 a180 942c 942c 942f 942f + +00:00:03:18 9420 9420 94f8 94f8 91ae 91ae 5b20 cd61 6e20 c7f2 756e f473 205d 942c 942c 942f 942f + +00:00:05:00 9420 9420 94ce 94ce 5249 c7c8 5420 a180 946e 946e 5245 cd4f d645 2054 c845 20d3 d5d0 d04f 5254 d320 a180 942c 942c 942f 942f + +00:00:11:09 942c 942c + +00:00:14:02 9420 9420 13d0 13d0 c120 5749 5443 c820 a180 947a 947a c120 5749 5443 c820 a180 942c 942c 942f 942f + +00:00:16:05 9420 9420 94f2 94f2 4954 a7d3 20c1 2046 c149 5220 434f d0ae 942c 942c 942f 942f + +00:00:17:01 9420 9420 1370 1370 ad20 c2d5 52ce 20c8 4552 20a1 94d0 94d0 ad20 5b20 43f2 eff7 6420 43ef 6ef4 e96e 75e5 7320 d368 ef75 f4e9 6e67 205d 9470 9470 2020 c2d5 52ce 20c8 4552 20a1 2020 c2d5 52ce 20c8 4552 20a1 942c 942c 942f 942f + +00:00:22:09 942c 942c + +00:00:25:26 9420 9420 1370 1370 57c8 4f20 c152 4520 d94f d52c 94d0 94d0 57c8 4f20 c152 4520 d34f 2057 49d3 4580 9470 9470 49ce 2054 c845 2057 c1d9 d320 4f46 20d3 4349 45ce 4345 20bf 942c 942c 942f 942f + +00:00:29:22 9420 9420 94d6 94d6 4920 c1cd 20c1 5254 c8d5 522c 9476 9476 cb49 cec7 204f 4620 54c8 4520 c252 4954 4fce d3ae 942c 942c 942f 942f + +00:00:32:23 9420 9420 94f2 94f2 cdd9 204c 4945 c745 20a1 942c 942c 942f 942f + +00:00:33:29 9420 9420 13f4 13f4 c74f 4fc4 20d3 4952 20cb ce49 c7c8 542c 9454 9454 5749 4c4c 20d9 4fd5 2043 4fcd 4520 5749 54c8 20cd 4580 94f4 94f4 544f 2043 c1cd 454c 4f54 aeae ae80 942c 942c 942f 942f + +00:00:37:11 9420 9420 94d6 94d6 c1ce c420 4a4f 49ce 20d5 d380 9476 9476 c154 2054 c845 2052 4fd5 cec4 2054 c1c2 4c45 20bf 942c 942c 942f 942f + +00:00:40:12 9420 9420 94d0 94d0 cdd9 204c 4945 c745 2c80 9470 9470 4920 574f d54c c420 c245 20c8 4fce 4f52 45c4 20a1 942c 942c 942f 942f + +00:00:42:16 9420 9420 13d6 13d6 57c8 c154 2049 d320 d94f d552 20ce c1cd 4520 bf80 9470 9470 c245 c445 d645 5245 2c20 cdd9 204c 4945 c745 ae80 942c 942c 942f 942f + +00:00:45:21 9420 9420 94d6 94d6 2054 c845 ce20 4920 c4d5 c220 d94f d580 9476 9476 91ae 91ae d349 5280 9120 9120 c245 c445 d645 5245 2c80 942c 942c 942f 942f + +00:00:49:15 9420 9420 94d6 94d6 cbce 49c7 c854 9476 9476 4f46 2054 c845 2052 4fd5 cec4 2054 c1c2 4c45 ae80 942c 942c 942f 942f + +00:00:51:26 9420 9420 94ce 94ce 5b20 ce61 f2f2 61f4 eff2 205d 946e 946e 54c8 4520 5749 d345 20d3 4952 20c2 45c4 45d6 4552 45ae aeae 942c 942c 942f 942f + +00:00:53:23 9420 9420 94ce 94ce 57c1 d320 54c8 4520 4649 52d3 5420 544f 204a 4f49 ce80 946e 946e cb49 cec7 20c1 5254 c8d5 52a7 d320 cbce 49c7 c854 d3ae 942c 942c 942f 942f + +00:00:56:21 9420 9420 94ce 94ce c2d5 5420 4f54 c845 5220 494c 4cd5 d354 5249 4fd5 d320 cec1 cd45 d380 946e 946e 5745 5245 20d3 4f4f ce20 544f 2046 4f4c 4c4f 57ba 942c 942c 942f 942f + +00:01:00:08 9420 9420 946e 946e d349 5220 4cc1 d5ce 4345 4c4f 5420 54c8 4520 c252 c1d6 453b 942c 942c 942f 942f + +00:01:03:01 9420 9420 946e 946e d349 5220 c7c1 4cc1 c8c1 c420 54c8 4520 d0d5 5245 3b80 942c 942c 942f 942f + +00:01:04:29 9420 9420 136e 136e c1ce c420 d349 5220 524f c249 ce80 94ce 94ce 54c8 4520 ce4f 54ad 51d5 4954 45ad d34f adc2 52c1 d645 ad80 946e 946e c1d3 add3 4952 ad4c c1d5 ce43 454c 4f54 2c80 942c 942c 942f 942f + +00:01:08:08 9420 9420 94ce 94ce 57c8 4f20 c8c1 c420 ce45 c152 4cd9 2046 4fd5 c7c8 5480 946e 946e 54c8 4520 c452 c1c7 4fce 204f 4620 c1ce c7ce 4f52 2c80 942c 942c 942f 942f + +00:01:10:28 9420 9420 136e 136e 57c8 4f20 c8c1 c420 ce45 c152 4cd9 94ce 94ce d354 4f4f c420 d5d0 2054 4f20 54c8 4520 d649 4349 4fd5 d380 946e 946e 43c8 4943 cb45 ce20 4f46 20c2 5249 d354 4f4c aeae ae80 942c 942c 942f 942f + +00:01:13:27 9420 9420 136e 136e c1ce c420 57c8 4f20 c8c1 c480 94ce 94ce d045 52d3 4fce c14c 4cd9 2057 4554 20c8 49cd d345 4c46 946e 946e c154 2054 c845 20c2 c154 544c 4520 4f46 20c2 c1c4 4fce 20c8 494c 4c3b 942c 942c 942f 942f + +00:01:17:22 9420 9420 94ce 94ce c1ce c420 54c8 4520 c1d0 544c d920 cec1 cd45 c480 946e 946e d349 5220 ce4f 54ad c1d0 d045 c152 49ce c7ad 49ce ad54 c849 d3ad 4649 4ccd ae80 942c 942c 942f 942f + +00:01:22:13 942c 942c + +00:01:22:18 9420 9420 94ce 94ce 544f c745 54c8 4552 2054 c845 d920 464f 52cd 45c4 20c1 20c2 c1ce c480 946e 946e 57c8 4fd3 4520 cec1 cd45 d320 c1ce c420 c445 45c4 d3ae aeae 942c 942c 942f 942f + +00:01:26:01 9420 9420 94ce 94ce 5745 5245 2054 4f20 c245 2052 4554 4f4c c480 946e 946e 54c8 524f d5c7 c84f d554 2054 c845 2043 45ce 54d5 5249 45d3 ae80 942c 942c 942f 942f + +00:01:28:22 9420 9420 94ce 94ce 54c8 4520 cbce 49c7 c854 d380 946e 946e 4f46 2054 c845 2052 4fd5 cec4 2054 c1c2 4c45 ae80 942c 942c 942f 942f + +00:01:30:26 942c 942c 942f 942f From patchwork Fri Oct 1 21:08:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30879 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2090086iob; Fri, 1 Oct 2021 14:12:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLakEUSvWcNEM5S8EMK84NX/3mRpEZQO1iOnM/Hs6t2bghJhyyMwNLWpyzuoUjx0HcdHwt X-Received: by 2002:a17:906:2a8e:: with SMTP id l14mr105055eje.321.1633122734810; Fri, 01 Oct 2021 14:12:14 -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 u23si8931072ejm.298.2021.10.01.14.12.14; Fri, 01 Oct 2021 14:12:14 -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=Cyp3BjHa; 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 D624468AA3C; Sat, 2 Oct 2021 00:10:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068089.outbound.protection.outlook.com [40.92.68.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3CB468AA63 for ; Sat, 2 Oct 2021 00:09:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aYvcruSr1sgjgXxhIYuWqNIfoCRmQ7fcL+iKGi4ZdrJL/AzpgUliG0towGGCcpRb7KMQc7co+SmWJ4PcXoVUZtZFeIFU+r6f4xrPaDll05gutJy7rhswAJeKQrxmlNrpQWTZ53Cx7QzNgKx6mNPXKkhM0hgfPn/dSG3mKVwnzEgt16UpwWIY8yIRM6Ye2o7+nbfZUMU+DCU5gMrJLKZzdE5+6VC/uuQEk/zA/7iPF9GJDAqsJ3/QPv805V8Ia85wDGtsJ4ZUv93RERwAf8CJRQezpvwfu4dGh7xnlUy732ljnvEQpjJVNmp1UejZCErnnVK+pXV/rT/nUMyREgjWAw== 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=/HtYICkeBoaiz4q3Baxy0e0w6Gv6epSgqmMdxOsJyDY=; b=FszR/m7MnM+F9lPRKRiot62Ct2N9Hx3IrnZvl2WMszWXmgoBY8qeuqWCbl3dWhxiaZbUYoBbIpwWIk8fo0VL1mYZw7MwwOeO+T4qjpg8jqZWmGrlp3n/4g1NRXzhAt6R0DcLPM/cxODi2s/zdtx4tB+eVHU7AUbkoDLIB9QpriqBTPq8D7lnlj/D/y1kOYgQsWV9XYigjf1lC4PZ4vT+D/ztj5AfWsQZctLaZtzWQDLNLnPqBYt8xz28BK10s3qb+Z6e5WCYUM1nrKUvUDgMgpK6yZZdTSS2xbIDgjBR1rqCf1wnDX5ME9HFqzbz8el2WCPfaSJ4kE4R+j7HShsg2g== 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=/HtYICkeBoaiz4q3Baxy0e0w6Gv6epSgqmMdxOsJyDY=; b=Cyp3BjHaK7X1AJu6qlF8JMapSmKUXthIT0SKjO/Fi6s2rQNa9+HPv7N79z7N6FOEggtzN4HJ07DBEHx+wq6QV0zGefndWBL/uth/O4c48kasWzTQInJk7NoXpZTGZW6R6MDbmXGMXkX5wMkekLMXvGyhH+J0VTliBwv4Jagfa1R1NNmWFvLyw0UzxVbUZxY6axjlsd6c2cw6IPRmdLkI5bOypnirVGCzaj2j1Wq0rrnbX85hbYCm5WZlXtBm+cJA0o6z8fa8EHQe3b6FY4Ijf++y+q6z2c258kau1WSGTAfIG7hQoXHqfcdaXZXPpTJOQaiqtj0MelObh+3p8JEW8Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:58 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [5PAB76bVrIrc1d6ykEg/IONtPAafzh6G] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0e481936-13b5-4346-c7a0-08d9851fd305 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVM2asYY12qjM1/Eg4mHSQyQbx0tG2k6hIj/r8zekBus/lOOhJ9pUbV0ob1F5Uk+X8vBfompf3Sut91/DdpQIDeHdV5Y/07ISnn9w+zMhGkmQsuGg0YQj003Wpc/BHH5tnTE89gLLIj4wDhb2vI0bHMBO5Lp6z3qtZtIG4GX5Oogs8tgSH6L151xgGe+VgoIz7OMma5K8sqPe+33FstlkVIQRt/lCi9PPIc1pAl3RTEg+KG0BQwuqyTP0OQ8fU4J6n//owgZYwtyyXwyTLSOKoVqFsSxN4QHM6Ir+XFIxbJbhIDB/cIGd2K5kVrikltSK+6LYJOebrQNEfEzTMtAHAuN+msPmo6mDNknlQD/ZO0l7dO2axGSHOd3vAzzfXpckDERUSF+f2ouhyPkL8yY29XHYgsNF/sLLlDthUWuSxMkGrUN4mbO8Oa4iAd/XUUwWZIWogPkIhi8CVZFdc1uD0YkTWsl33aKIJEpJngEdzTTAOmKRSB6U/eHI+aP5Fk87MxN46zzZsHxymOTmP4zzw2h6sdxKIjgueoM7beWsBx2zUFKXZpgxYCV9y0YuZgjgHyr8jToQ1PGtVk9yzmVlj3xfPPOEsDsy8SO1fWSWoFUyUx3LJJwB6CZhw+MZjB3IBCuCvn6vw/b8vW2tMGsILSXnNXPz8m/YRS4xgLQPxcEIM9VH3x0tWhdC7fFFLu/BqtLad6vmbbBB7VHlblHkUfeQ9aXwh7v48= X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qC5/kien7j38SZLF8DX0l0t/MyGIpVIUtIE3M5MAXRUWtFXyD9QlRSLhwBjXf9GA1Uf9+pp5Ggma+WtlJ2TJqpEErzGAYVet3mt5sFLOhgLRdT/UbDAuoSBVR2770DY8O9hiN+S0V1niWFwyHHC3+qwk0XiDMa/hlUpoxVNUSIGAudYHAgzTpm5vOHD/pT2bNtkabjb64zBL+l4AojDtiQSEHZg/fRRkRaoRBumYhTn1TXwSFNGrsi7E0H9BpXnCjYF8mdc6IAGudgXL4mVfDfBrVJsq/sG14I7I/LbnVC2vbx7AKnwbadujPQhdp8uQsG6uC0FNudZIIF/v3gcmIztmnWWnzoeuBGDJGz/Ru0uawDVlZypfNt40AAuyWxn5MzyTLDC2Ll9l/iVis9mixbcoW5keBMv6dlbGpi/GfLnFgePizQfawmcP12AA+k0s X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K648XGcYnyrojtcMT+ryjxOjZzQLJ3slhbDhu8np6nD4pws7Y9tCkRZqwqIKGq2VqRCcZEBjMfK+XaNc34c75wnfs84TysZu7HBq2afE6ocGuMFEW+mtCVcOnXx6GozC2LPW99utGlaZxGysviWEtQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e481936-13b5-4346-c7a0-08d9851fd305 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:58.3484 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 18/20] avformat/lrcenc: Avoid allocations for writing packet 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: GvIP+T76qEbD Signed-off-by: Andreas Rheinhardt --- libavformat/lrcenc.c | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/libavformat/lrcenc.c b/libavformat/lrcenc.c index 0de0bb18f4..21cb3860ab 100644 --- a/libavformat/lrcenc.c +++ b/libavformat/lrcenc.c @@ -86,33 +86,25 @@ static int lrc_write_header(AVFormatContext *s) static int lrc_write_packet(AVFormatContext *s, AVPacket *pkt) { if(pkt->pts != AV_NOPTS_VALUE) { - char *data = av_malloc(pkt->size + 1); - char *line; - char *delim; + const uint8_t *line = pkt->data; + const uint8_t *end = pkt->data + pkt->size; - if(!data) { - return AVERROR(ENOMEM); - } - memcpy(data, pkt->data, pkt->size); - data[pkt->size] = '\0'; - - for(delim = data + pkt->size - 1; - delim >= data && (delim[0] == '\n' || delim[0] == '\r'); delim--) { - delim[0] = '\0'; // Strip last empty lines - } - line = data; - while(line[0] == '\n' || line[0] == '\r') { - line++; // Skip first empty lines + while (end > line && (end[-1] == '\n' || end[-1] == '\r')) + end--; + if (line != end) { + while (line[0] == '\n' || line[0] == '\r') + line++; // Skip first empty lines } while(line) { - delim = strchr(line, '\n'); - if(delim) { - if(delim > line && delim[-1] == '\r') { - delim[-1] = '\0'; - } - delim[0] = '\0'; - delim++; + const uint8_t *next_line = memchr(line, '\n', end - line); + size_t size = end - line; + + if (next_line) { + size = next_line - line; + if (next_line > line && next_line[-1] == '\r') + size--; + next_line++; } if(line[0] == '[') { av_log(s, AV_LOG_WARNING, @@ -132,10 +124,10 @@ static int lrc_write_packet(AVFormatContext *s, AVPacket *pkt) ((-pkt->pts) / 100) % 60, (-pkt->pts) % 100); } - avio_printf(s->pb, "%s\n", line); - line = delim; + avio_write(s->pb, line, size); + avio_w8(s->pb, '\n'); + line = next_line; } - av_free(data); } return 0; } From patchwork Fri Oct 1 21:08:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30865 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2090229iob; Fri, 1 Oct 2021 14:12:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywPvFHPq8joM8ICMnjWcuNVQBdrHjwCRsjGjx3DOV5UCCfhUG2n3NlBtrR04Wba9xGfy58 X-Received: by 2002:a17:906:d14e:: with SMTP id br14mr134937ejb.61.1633122745360; Fri, 01 Oct 2021 14:12:25 -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 de1si8003638edb.375.2021.10.01.14.12.25; Fri, 01 Oct 2021 14:12:25 -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=jw1v4JQt; 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 E137768AA97; Sat, 2 Oct 2021 00:10:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068101.outbound.protection.outlook.com [40.92.68.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6AE6768A877 for ; Sat, 2 Oct 2021 00:10:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c8u3on+iV3MrI1NHSbu2GuzK7WJZ9E2jVGL6iVv1dPV0Xqxj6WcOtGSIDtbggvD3L9dIcFPwGoYdgqUpTvWrblDOHoLCQ9eibuxAP0gfBqanI+cLX24YAzIigdA8ERo4p2VnCd4zx128Vpmt+TGISba0iklEcUGzvAJ8hUeO/PY2gRDbWKIxga/7OyQsO3qGcyEuYAli0NBdztGAEeLwJi4oy4OCcJH4FZQ5RUOn+OS3Gmgh9+q922YBU04Vm08fXCvlB09qF9Jtepajm9hsRWa2AquhsXETVTSsaCBVwiCJRIA1aLRjbUp8KJvPdsWe4xLIJ+3Wfe/XAAQtbsKHBA== 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=+pjP7+soSvaHYM3yenrw7EyhDZ+jMts9yTxW58x6/Zo=; b=T4qz/G0F6h+8Ged59EjwezXpfoMpu1wStUh08L4RGBw480ppa6AaNaHGCXlDevWlwZSxc2RR5Al7jML2aTTlWHXZBwQ78/FFMzTLc49OyR+zgKVwNuNQe7lc0p5wWukCHfgbu36ilyWf5tX0kbq764vGu399hiHp7GVruUEXKf+yK38a7iNo1ziypXrlzK38GI0HDQQBjBsXPVNvdRSoDVsHShVUVZrAY5B7ku3bikKiW1wU8Ms11UAHkVJI/YWvjK9kWIw8kJsRpvHQKaPvVltBHtS8i/EZEJ97SJTNc1pHHybSg+XxIq92LnXrW/YTauM0QCY2PItVtg9KPb1msA== 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=+pjP7+soSvaHYM3yenrw7EyhDZ+jMts9yTxW58x6/Zo=; b=jw1v4JQtmrtBGySMtMlUXj4BmlolJ1xMCxYsAP5KNlz5wjv3vLa8kI2h8hzOkjcOaE4ZRuKuIR1nRdZyVPM1GQNe3bmLSlSPgLztgxANd1sb9yqeGvWfPCGL5qJLXFyFCfUttFx6WR3La0Yk4t5FpKxdmVG/qFszctNy6nfLzP6y1Rct3Q2AD74O9oeml9QyAHxY0yQ1fXs9KIbl75DnPKj0hTq+R2MXUxmQYEd8v7g4V7++tax990XR/UD2T2Pqea+baDtCvbCD6Tm+IVya2BUKqc5B7sSMPjMtK+oN4YRNMnX+M7WgGhiW6RJ2HpuHaWsLga500AQoRZVgXV7BJw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:10:02 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:10:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:36 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Z1f1ttsK7Tn4sMdvcXblURjlQPT/styb] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:10:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7bc77bf7-984c-4014-fdbc-08d9851fd542 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL387mJJPv+D1gZZJNbM3QQM5verKeruayumwV7+jBy+k5SF2Rb0Yjsw4tJf3QP/wABANu1iIwbQj6ei7bSSRtqhoYqX7MoxrWNk3+P0HoEghzuEeSY01wJTUtpbLfRaCUXF7vHXbwc+meo105uto5uheTcWE36PwFa5mNytWP20yZkP+FR0QPdnSJFIzIS0xITwt8oirp6+govtfdQE5phXcFzLnAsjUtaDohqVJMTwexFX1KcVXalGAVJiQ02zs7Wxgvxus65Ya/uXDDSfShn7U3fZPPI1UlHgdhkjvSZUW+hdYA8YCMW3wdMIO0QQyHyDenUgEX8r+xHNrsBxS++ex7Vf8kJ752DrGxKV/wJBAkj6asSu+NH6zG/b2desMHbuit1MVjpBhk0qZ0OvpM7Kz7nQPNWtgzh1VwGlHR4dAANDIF0JFtMDA9rXBz5W5l3nt6lhJCTSXKRA2galuH9SEeR3lX9kHH5XGS3Tbf1gFb1JgesaLLBZWFLpY/stDHB+g/fVwWJRAsY8Hovz0hK3F/gUBNyD2RIX8/uKTJP7k4UjsLbSL6v4sLYJwUOxzau7p4YSQClGhoDkeEkJH0mvmXyaDfp0+dMs2TluCh8Y/YlgWxfUbVaqetgvXODnABv8rP2nNs9/gya77Fgjkh9oxkll7RCJpqFnpSM7vLRqtCev6vB7ESGHRzTIUeotZ/bL9I6db/f5g== X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3PAA4dFPVL8JJgjxFFe9Re9hiaE1raAfPO4LcUHsuVwaTfLmeJkKh0j+QfEHkBqkrF65LUc7ZnOO8RmjWILgvrEZgNOD5tTFG9iNwZDBVvENuIiuzaNULpLsZft6+qUYh7pMaQ5Dzx24cYP154Y1G/oBnezp1frhmM3Sq8VBL18y3cLjLJoDsLelasJnfbq9KMyJXOwKZTODBs0JNKGkqRw57Kn4NtiAoikN6hGrKz2j6Clr+B1rrlb5cIOF9LyNnhxYUa3OCh4DmSPyUSBR0zrUUYgvig9Uc6sz1ZM2QoOGa9hD4atxwHQ5xODjZ5VFiW8r2Xv2dtYbmxiqaMhga2hxifM/TGJc10bptc6WI67IGtgkaGglhxMkVDQjSBxK9gWDAtod+fuiiUCeHu7QAruBcXmFa8dXfuS9Fdss5g4bFW8BMogD1YCpldQ/vZ9q X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vcaybDhTkV0oTk6UH8X+fya3A1eNX1pCEJtxWcGyKc57MJiSrWIwiNjPhB24UNbR6pHenldTsvcvi966zElceqzOlGIhgrO+rUh8qdvCgBcxyMGoU+y0DDxyYdlC0H1RVe/OEFUAGJM8bzzPjJ7mSA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7bc77bf7-984c-4014-fdbc-08d9851fd542 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:10:01.9905 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 19/20] avformat/lrcenc: Unify writing timestamps 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: il2UeX2w7uYF Signed-off-by: Andreas Rheinhardt --- libavformat/lrcenc.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/libavformat/lrcenc.c b/libavformat/lrcenc.c index 21cb3860ab..4fa14ea427 100644 --- a/libavformat/lrcenc.c +++ b/libavformat/lrcenc.c @@ -111,19 +111,14 @@ static int lrc_write_packet(AVFormatContext *s, AVPacket *pkt) "Subtitle starts with '[', may cause problems with LRC format.\n"); } - if(pkt->pts >= 0) { - avio_printf(s->pb, "[%02"PRId64":%02"PRId64".%02"PRId64"]", - (pkt->pts / 6000), - ((pkt->pts / 100) % 60), - (pkt->pts % 100)); - } else { - /* Offset feature of LRC can easily make pts negative, - * we just output it directly and let the player drop it. */ - avio_printf(s->pb, "[-%02"PRId64":%02"PRId64".%02"PRId64"]", - (-pkt->pts) / 6000, - ((-pkt->pts) / 100) % 60, - (-pkt->pts) % 100); - } + /* Offset feature of LRC can easily make pts negative, + * we just output it directly and let the player drop it. */ + avio_write(s->pb, "[-", 1 + (pkt->pts < 0)); + avio_printf(s->pb, "%02"PRIu64":%02"PRIu64".%02"PRIu64"]", + (FFABS64U(pkt->pts) / 6000), + ((FFABS64U(pkt->pts) / 100) % 60), + (FFABS64U(pkt->pts) % 100)); + avio_write(s->pb, line, size); avio_w8(s->pb, '\n'); line = next_line; From patchwork Fri Oct 1 21:08:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30867 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2090357iob; Fri, 1 Oct 2021 14:12:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1pqiC7+reEt3FNkcwUZ3mbwvMv5usTqU3eF0iVzUIiHDfD+7NKkw++mTWLo2xEPBRtAhN X-Received: by 2002:a05:6402:3128:: with SMTP id dd8mr259713edb.383.1633122755689; Fri, 01 Oct 2021 14:12:35 -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 v3si4164900ejw.579.2021.10.01.14.12.35; Fri, 01 Oct 2021 14:12:35 -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=BWqKAXXM; 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 0A2AB68AA6A; Sat, 2 Oct 2021 00:10:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068073.outbound.protection.outlook.com [40.92.68.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F37168AA89 for ; Sat, 2 Oct 2021 00:10:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=drnlZ7OCPB6MkK/MMsvNLDX1/E5rrX8nFZNYjPzP2My3I43mKSjIM7hhZjSkNpRN4sR1dtw6dp3K2gS+gCFxPEVPAEvSdvCMx804LzPfumPNbM7NDAAny5kjnMlaNIlAsO43M4P0rRFOPOWHdLAl122d0DY7tqWCMQFJyNBS7lzPOXbT6KVcQpiNPSReoPSvcDXPitlnDkJNkRWftoAAUhhmqmEs3Cj8hiCNMoQIBUk4SZT8D5VeRfxcPVav2qygcfr4J2H38yCUxRFbCz2ecoKSRRa4xr/duf9NLsWBLvKAK/ycMwnCNVF6RGtUtNDsh6bZCSIylO93NwtTdO/hwg== 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=3o7JwY7fYOBnj4omrx+trQeLq2QspNuyfUaJYk3DmCY=; b=QoU5QTLNovpXu3zuTdojK/J0A9GcDhlFzNn4nuyLl746pcsllj5mQ7SsJSyMPqk9GsFGikRGn2rhB0+KR3m/WzaKaY5xmXxz1LPasOzDhOIRfKs3mzTpMogEsRQfOGYKXidZXvpjSELn72a4HCVKmfnXmRt+Yc0HZfOwRDLxLR6L/WUVgP+ghynfAPoSkASemR46RNhbbjFYFOaLKpr7ccJLh+ESSW7MCJ+rpgMuz4QzRUh7TX7LR9dJ/GYeITu0XnThFSqtmP2UeljCJB8MI125Nd8yABSi1VGwI9qKPoBdZiwjAGdOWsLfmc5VxicN3xJ72QG2Kv5Q9EaYdelnWg== 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=3o7JwY7fYOBnj4omrx+trQeLq2QspNuyfUaJYk3DmCY=; b=BWqKAXXMMTSzVsSB3IS7lB5qSBM9nfUBMd+XbvlfG8esGJNc3im87nwi/VeB0dJs4yk64yJOdC8ezgnZaBEaEJGe7RyRTBAlJFagWLsiFojEnqkE5WNFOxxGm453NaET4V08azKZ8Fp+2wlxQdKCEtJXsvxnYpVeWlTPyqmARmsKMFBDF0CTp87eKoycvGbQRJp1WI6wUYQLUQBzSZxmP9fJhX4JjXgMsxc6Nm6mE/7PunHcNiA+0xNe8w00L9e87iP7g/5QQfCZExF8N5ckqqBLxHsa9yJRGcf4n6xE4k6EBfK1F5CIiFkIGRokMqGmDbd6Bdc6uK3JGkMD2MTdSg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:10:04 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:10:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:37 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [GRc8FCBCBfnfzknieZofJRKzKjGKd1YY] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-19-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:10:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 42bf39fa-fecd-40c3-d174-08d9851fd6cf X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVM2asYY12qjM1/Eg4mHSQyTJ2zh2Nuuxo4a6i9FaSBbCtpeKt2hG3kW07fCkvH7n2xkpegZaC9X/ZMDESKJgMaeDH22WvaGKNAq0FpMK8v8O0ahouW+7WOGPYH3ZjJl+ucycrAofGb4O5OaHvlIY2RbBcbIo0MDiAQqrA7xaqcQu0TJhDSLzRIG1RA0LTtaAbbbKwtfVmnIqjCiwv3a43psOX/2honSiVIYizihvWQ3pdNm3B6WwEW3yCjnEDsSYtJ43qqmOlIoL1tTYR8+ch4wrIluBuXGc1FAKnst39wvAtyoLEzgKod9MIzo6mm3yANO90JJbNq7MvCLfTI6LYTTokllZeRz9/jhmFimSqxnBwsEZIROiRuFituNPAPlsdiO4JAJwC2ZpQl87+vSoeZrLESRDKXcbN51snh91QjXmJLDU0TWjGZ3OxnRi7uSeyq0Or6cUOv1oIE4A+8BvU3bLFBxr1VtP2nJa1iOAUea2+Z93nTjapIuM+PPUip+V9IsBwU6ayShWnSY9kgSfZ/PgKxC3Gw1OdKEeIaviuVGAo8MP6HqkT9lsmxWJZS4+p2X1xzSK66qFlywUvCjA+cCn4IJbbCeOA+B06wVGmQRnAc9OeOuat5cwkwoBLXcLqCn8HJe2+W5S/p7PwabeKIQHoHqYXxQ1Y5kivf26ZzK0CFAJC655RJyLEN7aqlgRalMrCAMfxj6F5OH9hC5/Bi8PkqWer11Xk= X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zPK3/ROoE+Dr0swUPuhhxNfssKiNLMSkheZiU6p0y4hUDScDDfO1IBDv0JkzQhVBSb5oy+Ino7FHyIrDX/kescbY2E/2M0QYMDAc+s2YT4FqYi2MNNHIU6LAjRwthvAVoA+mGkAAhUkinmvjn34UY2HAJjBsrKpWfBLC4ynQs2L3z/0NCCgI8f4nHnQLzRLl9osscXOQqqxhlutOPr6LnNNidkng5lji5mHhKBwxABSjjd3aE+Qzhc8I0XZr5ElkhEyyFAU97F6O6oo4nBQQiAGcrc9KCqzZWZpYBh2q/STv/vcR/f2mV/uiJqIgjzi4dcjlWEEz461x3h60dxALfwuc9dxv8T3jClOradky/AJzAIDU5MAGGpNT5QMGjxVSBpyXIED7gRZ9nZh3BM0pc0k2Fi7TtfFOsYUgFVv/oOz11TgRzF/JklAywQoyLjdc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TarcFeWe53aTJzQhIvws3hJftoKKG+OegWG9b0jteXmd57sORe0UaLHET0Lsa3TuvGixJo6+Qj4uDSqWXY1ttuHrK9D3OwKSKcCFvWmhBc4mBm36UteQvnODNqSmsPBbBchQyjrcNzzlcy+pQ8ceRQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42bf39fa-fecd-40c3-d174-08d9851fd6cf X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:10:04.6648 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 20/20] avformat/lrcenc: Remove unnecessary header 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: gONd2vyGPu8C Signed-off-by: Andreas Rheinhardt --- libavformat/lrcenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/lrcenc.c b/libavformat/lrcenc.c index 4fa14ea427..5703a95180 100644 --- a/libavformat/lrcenc.c +++ b/libavformat/lrcenc.c @@ -27,9 +27,7 @@ #include "internal.h" #include "lrc.h" #include "metadata.h" -#include "subtitles.h" #include "version.h" -#include "libavutil/bprint.h" #include "libavutil/dict.h" #include "libavutil/log.h" #include "libavutil/macros.h"