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;