From patchwork Thu Sep 9 15:57:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30096 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp650045iov; Thu, 9 Sep 2021 09:00:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwr3JKhVNYLD5bq/M8S5O5fDqW595wgNrPtuRsNcyNa9mnix3I3YBgQHx+b2ZxZLYR2SR+S X-Received: by 2002:a17:906:f15:: with SMTP id z21mr4079608eji.177.1631203206955; Thu, 09 Sep 2021 09:00:06 -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 k1si2112067edr.250.2021.09.09.09.00.05; Thu, 09 Sep 2021 09:00:06 -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=jO2eWWra; 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 D5F5868AA47; Thu, 9 Sep 2021 18:58:33 +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-oln040092074082.outbound.protection.outlook.com [40.92.74.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F09C868A9C4 for ; Thu, 9 Sep 2021 18:58:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NFvt26Hu2+geS2rxb3sfsVChUF3h5ZpQu69b+hJ+35qXH3QVKaVbvlsE4jnAyftK9ZBjdxs8PQRUJjAayVKTCa2635VdII0RvuHb+n1aiBCtGS9wpfM45piuj7pB7q7Kd2HWJ0MxoTwNNlW5/CtuX3Yl/puDz5pOoLElqgnCdSE9Iu5bcviiEQeF0WoX3EMlrBfzEMIcdu1biuvOX7Wc3RkUryiUn/f5GYkl8u7EoiAktCdLOxSEn7eDcIKbGyhZ3H1h0R2eTR8/Ax8Jx8cRzVb7GqNRlmAmjnHbrdAr8w/hHpPo4lLn02jObnxsQInItfqs1mEy7JbES/w8RhPbGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=c/8LgLzgJZ0AP2A8BOTrm8l363p5y5QijYOTfHzT7YM=; b=Dmdvy+MsNpSldfAuHn5ERkdl6He31u/sTC53V9WmbhtbuOP3dER8w2jPq9bV0twM4qoFH58q5EJaAkdTyk/qlin+aFbRoNG33JpC+bYCnbv9/KAjTHIxzDQnCu51ivHVz5OW638dIsSIJ8J16Iylcwx1MSSOn7oen1vRSUn8f6NPzg7dEqAGtakzTEh0vbJduchT855UyhJKdpiom28+If86CJJInuL9qFtRTyNhwW2NcXDd8CvE2B+djXyh9Tdii8QbC2zkIHxxdFCQ3WiUpoBClnAY2jpWHgmgdhvV//ht19tgoaTkCdNmh4xaJ4jN5zGAHBHvhJ7/UdRtX61srQ== 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=c/8LgLzgJZ0AP2A8BOTrm8l363p5y5QijYOTfHzT7YM=; b=jO2eWWra238o0Z2zEp0oxE9EjMNn6pDSQec4Hgoz1f495pxpHB8DLCO0rrPMyJYN0lPJcUXewY3f2kLKwTpAMlF9hh92zT4eFCJSuMOZOg9JvaabuMOb8WATdMQRZyKRb7suZ/5EEBZWN7tkhN+/QkLoB0xF7B+WnnnZPeEOGWLmc6Ca9W0zwuNkD2DjLs6m9zbMrv+S7ovTYTKPOrlTh9lTmL6iHtQwADI+GOs8rUnIIlz5TuVnuTEki11PQjJsHw4gKcprPbqaNUkriHP/RR/oR7dYxgKQ5DuuYyLNJOG527l5A5Qgnzkv8RkgOVVDrnoXMlVOepiYwvbLZ6+PYQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6863.eurprd03.prod.outlook.com (2603:10a6:102:e4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Thu, 9 Sep 2021 15:58:21 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4478.025; Thu, 9 Sep 2021 15:58:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Sep 2021 17:57:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [zNmG0KFSpCMWwmPEeysMvieQs8VsPvRU] X-ClientProxiedBy: AM0PR10CA0036.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210909155747.1841422-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR10CA0036.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Thu, 9 Sep 2021 15:58:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 57a27288-4c42-42c0-1cf5-08d973aaa58d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQjHo/KsCc3LoxlbG+9PiyIN7rYFo3v+th9Gx0dfEDl3xkIdGO2T16Kw/P8+Ytpp8/EYPB8CYxgc1gtfkruL7N94F3ymuB/li54nxEEhK77m9PrAEIHrZFTkJ7tTpNs3p+e4rmHf9lgvNI8nX0PUFHuUdk9AgRG55/HEnj+Abwg3wrQ9FoSIZSrXclFT8SOoymRLLpNcQwTNIBBUUsk5sveKKIirU2TP/SM4tglx+cmyC+mkzAXFyXtg2I+5hd7gXwY8QP9C5QjESnkGSXl4R/JYLTj/leGA7neCHjGx0HFUvxtYbV7YbZzyXJ4zJXgTB6r3bfBov2TvhBTBHtHkefaXX2veXPK7UPuCSrjNhIcvuhyIFnTxGIN6SJkHgISky9I8U5U4mIXHhQkG1mjbH58aLtvsVcSmMNG3K52GxlDwDlw24ESNN/CuHvirvW2g4tS/SaEKB4+b8xd+PoiKYOz2DM9xO83URccSVvQVt1bYG1UxT07AhJGe6gQwI6Xz3QDhurAZo9loT5spG7xsUNxgAFXIyuPnn1tnfxpLMQZqYwwT/865dkrCKiRRKtLwooYCOeGFfWf/VgB8FMnXWaAKChIGJZzlP6pkdCykFh4bCi9qM00RS/AKyJb45N6MZhdVfwOgqdBlqDQVAs9LS41lmrKmSnaJPadbmSHzG7fgdUeN/AhHqyItLd5Q+FqzvCq7R8mQAgkUA5moVt8+yZgYtOfKwhSPjiGcpEnKTrSc5tQArWGSd2VQwpobf5Y0xY= X-MS-TrafficTypeDiagnostic: PA4PR03MB6863: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l/2gub3Fc99hr3q0GL/wqInO+aHrv6gwS5V55H7Al6pxVXVaqZPnG+ZjUr0TNroUFMi6eIsvdMQCA7dkvenUdGcTnkgLKKtgpfyXg8kWXIWo+xxkc0l3hFKCJCZGT6c6PdXK1xSu3RMOyhHhzMJQRzHI4ZNi6+d0tqaE4qCTOSi/BxpWMGK5oiiM9ZO3i8B1IZKD2LQh2L7Xhsy45n+0zv8OkwTw30MDwUH9IZoFByrh9Udn6yWT4GDHu4D21RpgBlHyBhMYFJrWG9TrkJ/tIFFwYGcBzafH8z2v3R6YYbxX292Y5fQpq2adbt9wFYYLa6jP2V+0BcThF5FgF+WNkum9yCP5u3v/wQQ+pWtBnm0++TYtF86/NCjaX1/hMF/AbaUPHoN59FGasu574ul7XmxWDIGZkYVOSK6I35unyYXj+3ffrzi9mrnFv7kfMPVr X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rTrCXhdkt9yo34TZs65QHVZBpIgIUJ9LtGnbwF3KgIG+C8+5YfC7n9GNVmlJ/fBg5aO7crsM8vh7VZ4NK4uLIyKGh2T2sY6GIXCoLKFsdPPxpbgxpfWdDYVNH7jIyh5Kefni9Y4OqiBVb39VF0igLw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57a27288-4c42-42c0-1cf5-08d973aaa58d X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2021 15:58:21.1138 (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: PA4PR03MB6863 Subject: [FFmpeg-devel] [PATCH 13/14] avformat/utils: Use st for AVStream variable in avpriv_set_pts_info 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: MR1Ud/PqjuZf Signed-off-by: Andreas Rheinhardt --- libavformat/internal.h | 4 ++-- libavformat/utils.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index d14dee5422..cc8c8f4b43 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -696,13 +696,13 @@ int64_t ff_gen_search(AVFormatContext *s, int stream_index, * (numerator or denominator are non-positive), it leaves the stream * unchanged. * - * @param s stream + * @param st stream * @param pts_wrap_bits number of bits effectively used by the pts * (used for wrap control) * @param pts_num time base numerator * @param pts_den time base denominator */ -void avpriv_set_pts_info(AVStream *s, int pts_wrap_bits, +void avpriv_set_pts_info(AVStream *st, int pts_wrap_bits, unsigned int pts_num, unsigned int pts_den); /** diff --git a/libavformat/utils.c b/libavformat/utils.c index b0814d7bc2..3e6b6a1e23 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1143,30 +1143,30 @@ int ff_hex_to_data(uint8_t *data, const char *p) return len; } -void avpriv_set_pts_info(AVStream *s, int pts_wrap_bits, +void avpriv_set_pts_info(AVStream *st, int pts_wrap_bits, unsigned int pts_num, unsigned int pts_den) { - FFStream *const sti = ffstream(s); + FFStream *const sti = ffstream(st); AVRational new_tb; if (av_reduce(&new_tb.num, &new_tb.den, pts_num, pts_den, INT_MAX)) { if (new_tb.num != pts_num) av_log(NULL, AV_LOG_DEBUG, "st:%d removing common factor %d from timebase\n", - s->index, pts_num / new_tb.num); + st->index, pts_num / new_tb.num); } else av_log(NULL, AV_LOG_WARNING, - "st:%d has too large timebase, reducing\n", s->index); + "st:%d has too large timebase, reducing\n", st->index); if (new_tb.num <= 0 || new_tb.den <= 0) { av_log(NULL, AV_LOG_ERROR, "Ignoring attempt to set invalid timebase %d/%d for st:%d\n", new_tb.num, new_tb.den, - s->index); + st->index); return; } - s->time_base = new_tb; + st->time_base = new_tb; sti->avctx->pkt_timebase = new_tb; - s->pts_wrap_bits = pts_wrap_bits; + st->pts_wrap_bits = pts_wrap_bits; } void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf,