From patchwork Mon Apr 19 14:09:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27048 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp560619iob; Mon, 19 Apr 2021 07:17:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9jL3ilbbr9QWhkpHORBkBQtgLSlXnRH3fX/lh2oUt9gEDEkfP4yEbEFjhaKE60Y2shDio X-Received: by 2002:a17:906:170f:: with SMTP id c15mr22085091eje.358.1618841846069; Mon, 19 Apr 2021 07:17:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841846; cv=none; d=google.com; s=arc-20160816; b=FSDLHz4SuaIid/bu/I1sgNwaoJv9jUc2ulHPYLiqNMhEZyssrIw6ZEHk9ZJv03J8Y6 Bshxp57rYGC5wkS8u/Sj7ThFJy6W6VlRy7Vp5EhOqs8Unq1VO0mhQVTusVl4CRNHnyYt Oga1K1LNJDFo8C2Wf87qdTOPWGgTUSrqrR6nmsJdMiO0eI4lhbC0E00cReiEY7Tn0de+ HjDhvRaxwz5H8BEyq+vLGMI1tLUpE1+Ii6hZZ8+Xi90nSp20wWDAFRCKjXGkWmgWdAh4 OCsBu5B8uFeTso6h8DQ6Y4V6dhiXMZGCWHDirR8gE/2uk2plxd5aIEikHZUqRCpDuruc SxrA== 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=X/MgQmTOKCY8CDJxLuufU5VhVqQnPok7P+5tkdJP9P0=; b=JbdzoYRGpVOxPXjNfO0J86lWdKGiBVTu/y1/rNjhVwACd4tmrQ/TrrNTPo9K2JJsFt 6DWI4CU6MNbzoBugUebU6TyHYc8mMnTu8Zzn8trFLar+FvgSe06uN/Hetqm8EYa/wWyE lLACdOAIkLdBvjYyfKX7teZD9pLbwcZO3I2J5UfTetLX1V/iD2KW7s8JXsRVTWMjbE2i tBEoqL6Y4h42Ns7hU8yR6xRYRON462ILWoHj3Ao09LNRwlmc7sIOSjoirmW8zNiDGh2m nNT5ogfjEmBFglWTnFQi7tPTNodcPVtdqX6dZhzrYt96hdmk4+xe/fwMMQjYXBHMK6Xg 7G/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LzM9mdU4; 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 w17si12546184eja.56.2021.04.19.07.17.25; Mon, 19 Apr 2021 07:17:26 -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=LzM9mdU4; 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 03185689912; Mon, 19 Apr 2021 17:12:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7172268980B for ; Mon, 19 Apr 2021 17:11:59 +0300 (EEST) Received: by mail-qk1-f172.google.com with SMTP id x11so35789143qkp.11 for ; Mon, 19 Apr 2021 07:11:59 -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=TwvjtLSS+/MVPPyBjHpBd3iYY1TehFAtgb6GOSpYGFI=; b=LzM9mdU4fPlj3417KLz6nbLNgx3tnpfoXHx+kgk+GFFw/+f78+cQwQKnUGrwGIEVad 1PvwNl2DoMPtc3BzoeTnS0yuK0w84o8apM2rMfHsvLtBI1SLo3UW9JXFPZj2LhKrLJpa zEcUK/RP3MO+ADtwj/SZ5YB6cOU0k2L8F0nzL8CusVE9o1sDlLspNP1gfFA95SNDYBNL GlpncYv3XWWxLPwiAhdt6C7+MRQjx5RqBig13QTMKFm5GqYd0TuStEHtXBUf5wFnRUUr wzFycIIdPOPKXxHsPk0/ouSuy7Fd/O+H2YCTCeIpofygwnALo6U/5+YFGzEFfz2spZev 7Hbg== 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=TwvjtLSS+/MVPPyBjHpBd3iYY1TehFAtgb6GOSpYGFI=; b=of5N9zuhjex3ps0NN3CNhpPRZBAKfz/VUJwDE1SlGoywlde3upzV6EvLpsC8wCGUPC rSAmAzMzPOUTuBfY0TpP53o6OcApeAvrGKNE7jOEP0l7WyJVmZSfTsJ2GQ2pqBWEk3OE kK5+Mso7pXzfIg/DUPNMvTZfB2rzJJkeSLonprCnnfHhF/SilfnGLSMjogfotzHwRxbS IoPsE66ttCcNNhh+6GVDWu+999qHmu9yOdspYWt5dbQEQSvevjgjvuPov6iFi6XMtVL1 YmSEQV9Vbn7T2Yc07gnfJ1evONZp3Z9N1lD/R5dudVSyUf1vBnBYjUDyohUhlA+TRT7t 8FCQ== X-Gm-Message-State: AOAM532787mYPntOZVIvWoJ9Xu6CxA60vytzN30f8XYZTj0JXL3C6Duj WQqKR+Tn6MLeN69gLc0bKtOR6VdBw8E= X-Received: by 2002:a37:2ec4:: with SMTP id u187mr12418996qkh.472.1618841518106; Mon, 19 Apr 2021 07:11:58 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:57 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:44 -0300 Message-Id: <20210419141024.8174-48-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 47/87] avformat: Remove deprecated AVFMT_FLAG_MP4A_LATM flag, latm option 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: KarlRcuiUTCO From: Andreas Rheinhardt Deprecated in 67747c89ad4d3bfb4381c3d274603a4f0da773d8. Signed-off-by: Andreas Rheinhardt --- doc/formats.texi | 1 - libavformat/avformat.h | 3 --- libavformat/options_table.h | 3 --- libavformat/version.h | 3 --- 4 files changed, 10 deletions(-) diff --git a/doc/formats.texi b/doc/formats.texi index 9387f98b6a..640b23b790 100644 --- a/doc/formats.texi +++ b/doc/formats.texi @@ -69,7 +69,6 @@ This ensures that file and data checksums are reproducible and match between platforms. Its primary use is for regression testing. @item flush_packets Write out packets immediately. -@item latm (@emph{deprecated},@emph{inert}) @item shortest Stop muxing at the end of the shortest stream. It may be needed to increase max_interleave_delta to avoid flushing the longer diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 6c12621bbb..6658a0f315 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1274,9 +1274,6 @@ typedef struct AVFormatContext { * This flag is mainly intended for testing. */ #define AVFMT_FLAG_BITEXACT 0x0400 -#if FF_API_LAVF_MP4A_LATM -#define AVFMT_FLAG_MP4A_LATM 0x8000 ///< Deprecated, does nothing. -#endif #define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down) #if FF_API_LAVF_PRIV_OPT #define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (deprecated, will do nothing once av_demuxer_open() is removed) diff --git a/libavformat/options_table.h b/libavformat/options_table.h index d041ffb641..62c5bb40a3 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -49,9 +49,6 @@ static const AVOption avformat_options[] = { {"discardcorrupt", "discard corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_DISCARD_CORRUPT }, INT_MIN, INT_MAX, D, "fflags"}, {"sortdts", "try to interleave outputted packets by dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_SORT_DTS }, INT_MIN, INT_MAX, D, "fflags"}, {"fastseek", "fast but inaccurate seeks", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_FAST_SEEK }, INT_MIN, INT_MAX, D, "fflags"}, -#if FF_API_LAVF_MP4A_LATM -{"latm", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_MP4A_LATM }, INT_MIN, INT_MAX, E, "fflags"}, -#endif {"nobuffer", "reduce the latency introduced by optional buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOBUFFER }, 0, INT_MAX, D, "fflags"}, {"bitexact", "do not write random/volatile data", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_BITEXACT }, 0, 0, E, "fflags" }, {"shortest", "stop muxing with the shortest stream", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_SHORTEST }, 0, 0, E, "fflags" }, diff --git a/libavformat/version.h b/libavformat/version.h index baef650f8e..7ce6660f43 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_LAVF_MP4A_LATM -#define FF_API_LAVF_MP4A_LATM (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_DEMUXER_OPEN #define FF_API_DEMUXER_OPEN (LIBAVFORMAT_VERSION_MAJOR < 59) #endif