From patchwork Mon Apr 19 14:09:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27039 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp560921iob; Mon, 19 Apr 2021 07:17:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCuUrUio8wfxXLFlcEd5mnkBCriMeB8Ac74A9kbljglQlJQSO5k5NKZrnKI6LsJj+r9cGF X-Received: by 2002:adf:e10f:: with SMTP id t15mr8578575wrz.331.1618841869709; Mon, 19 Apr 2021 07:17:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841869; cv=none; d=google.com; s=arc-20160816; b=ewNhunFNz5M/6HOlN+7HwQlgwp7b+oNv2WfEgwSwITU4uaz4Otjx5JMMbLrF9qp61Z ubtrT2o436LLzhgr8NPF8uH/ZsphH/JRMAmaDckJnDacvOug47YWy8pYDBxSWYnDicNL bWPNJCD1geqUUiWW/6uhP5E+01Y1yrsKoiesk2HPJAWHvvaEorwkbIbcS4PDWfMi24HC yavREFCmCpmrU2UQ9t/Hb+Z7YPaIvv7NYkHg7dq+Q1xexQDYxeTkkjX56o1FtSWa05dm ptmMQN3KTgZNtv1lD226DZJIr3ZFGCrI9mejAQwc09kacg5hhQwvB4ME1J7yAvjGUxhH LnzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=iuvIZNZf4f2lROo+qAmf/QTHZyyK3+OCjBsV5TZGvzI=; b=y3yyEmzDIzBkJc1WxxKRD1+1Fut4eDn0nvuTVEzpeIojnttMnh/vjSBYe9FA+3je6A xHl2ifiZWrx1AvmIf95IzwNMyRD2KaLO1NZUV2zXaPpP128LeE96FWZ5IGVDxM+L5bWW gekbR+5Ya7TMPIrMC4pWPR/j5pnB/55PjmJ9OpBt8rk9v0mDKCgYWcMLrxz+qPHJVWXI X5aYlMl3DDMeEpzp8Fdm/XBfge2RlkBDj/fsHtMRNLZwSReIAYpvg4T+Z2lnHIrOXjzO 2BLUOTQLf1S1V92Zlu5OOyeaOa0xOsxDwLwC5xM3mnRUlVcGOmGOArkUCcMTWopfUykp Z/lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hBACRQHj; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w5si4071340edt.395.2021.04.19.07.17.49; Mon, 19 Apr 2021 07:17: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=@gmail.com header.s=20161025 header.b=hBACRQHj; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A8246806EB; Mon, 19 Apr 2021 17:12:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12DA56806EB for ; Mon, 19 Apr 2021 17:12:02 +0300 (EEST) Received: by mail-qt1-f176.google.com with SMTP id c6so26141874qtc.1 for ; Mon, 19 Apr 2021 07:12:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=G/pwkDvJivBEDXFbcpAH5SdgB+EXhQPnXE1f+wKWigI=; b=hBACRQHjXcEmIy5C6QlubIy8w0KHRvjlSlXXCJs18Ceq2t9mYFCzJtPYByiAdqIjjH WEVZl1xVOAQe1w018COTOg7jS0Rg/VLxbGh31RrkaIIyPLrfDYimJxKYd8TRuBhRmpaG 1ietslwdRgRA+DNyl0AQPEcR331MoHIeim/CTuLp4BC1kuXLbToDVLrNPaWK/f9wo+FC +inYEtSDZ7mqqKfNwrGoZacW3UW/tmGj8rQ9z8jOWO9aU2ictcD7vQYK+LlkPbK23kBY NxVpVkFghI3opZzQ4OkxbBHVA+YuesZ+4HMT+hJBuwxilCJ6dPmj5nBQf0lauJ+JW5g6 FEeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G/pwkDvJivBEDXFbcpAH5SdgB+EXhQPnXE1f+wKWigI=; b=iWplGnmV3sR1xgQOytBtlKZR1bd8pQxokiSyD+/+uUk83fPZ8rDbtQP+aR0BqPp3a1 22Jlb6bxA2lUgQStd+A4i0X7lv3NFJOBYlbpf+wemPkeBOCodEfCf9rr3FzUNm9XXchY +c2ZRF1Z/k45u3uYI4mqrYGdnSZ2fjhpE4IM3R4TAGsswI6q5TPqkkiDKzRNJcCazqDv GR2Xl1OLv43rp9+eRCsTxnnKvYT+hHl0B3DBc20xWQ1a33+RFE2DQ45HYLoJ75xbjEFX 7IayB2tnmpzO5yDPZnt+kchPBShkqklG3J42T8A9efwG3dq+tPGo1JXg4fcboX+CpwfX gt8A== X-Gm-Message-State: AOAM532TmvLQrmA/eMA5WXoq08TLLFtvVS0DqJKX+mjIt/hoETuJVubt PyO+CYLyvGm5zoK+LG0sARr8vGkGzNg= X-Received: by 2002:ac8:5704:: with SMTP id 4mr1676171qtw.379.1618841520714; Mon, 19 Apr 2021 07:12:00 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:46 -0300 Message-Id: <20210419141024.8174-50-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 49/87] avformat: Switch AVChapter.id to 64bits 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6fv08OW2hkQN From: Andreas Rheinhardt Announced in e318438f2f30525d8baca2b5683aa9898d0c56f7. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 4 ---- libavformat/internal.h | 4 ---- libavformat/matroskaenc.c | 4 ---- libavformat/utils.c | 4 ---- libavformat/version.h | 3 --- 5 files changed, 19 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 272370db2a..bb8ddef88d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1092,11 +1092,7 @@ typedef struct AVProgram { change dynamically at runtime. */ typedef struct AVChapter { -#if FF_API_CHAPTER_ID_INT - int id; ///< unique ID to identify the chapter -#else int64_t id; ///< unique ID to identify the chapter -#endif AVRational time_base; ///< time base in which the start/end timestamps are specified int64_t start, end; ///< chapter start/end time in time_base units AVDictionary *metadata; diff --git a/libavformat/internal.h b/libavformat/internal.h index a6987619f7..7d0eab44ac 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -579,11 +579,7 @@ void ff_configure_buffers_for_index(AVFormatContext *s, int64_t time_tolerance); * * @return AVChapter or NULL on error */ -#if FF_API_CHAPTER_ID_INT -AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base, -#else AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_base, -#endif int64_t start, int64_t end, const char *title); /** diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index b36e86ecb1..c3d895f931 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1671,11 +1671,7 @@ static int mkv_write_chapters(AVFormatContext *s) int64_t chapterstart = av_rescale_q(c->start, c->time_base, scale); int64_t chapterend = av_rescale_q(c->end, c->time_base, scale); const AVDictionaryEntry *t; -#if FF_API_CHAPTER_ID_INT - uint64_t uid = create_new_ids ? i + 1ULL : (uint32_t)c->id; -#else uint64_t uid = create_new_ids ? i + 1ULL : c->id; -#endif if (chapterstart < 0 || chapterstart > chapterend || chapterend < 0) { av_log(s, AV_LOG_ERROR, "Invalid chapter start (%"PRId64") or end (%"PRId64").\n", diff --git a/libavformat/utils.c b/libavformat/utils.c index ba664f6214..e36b75081f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4589,11 +4589,7 @@ AVProgram *av_new_program(AVFormatContext *ac, int id) return program; } -#if FF_API_CHAPTER_ID_INT -AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base, -#else AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_base, -#endif int64_t start, int64_t end, const char *title) { AVChapter *chapter = NULL; diff --git a/libavformat/version.h b/libavformat/version.h index 70ac403a53..e6b2807f22 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_CHAPTER_ID_INT -#define FF_API_CHAPTER_ID_INT (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_LAVF_PRIV_OPT #define FF_API_LAVF_PRIV_OPT (LIBAVFORMAT_VERSION_MAJOR < 60) #endif