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;