From patchwork Mon Apr 19 14:09:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27077 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp567994iob; Mon, 19 Apr 2021 07:26:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6+6YMzHV6uRd+yA6lPQtxydGPvonWSgGaCDfbM+UEBIhltw+qlq9uoWeFQGtYGWH4X2rB X-Received: by 2002:a17:906:9bd3:: with SMTP id de19mr21597532ejc.329.1618842370700; Mon, 19 Apr 2021 07:26:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842370; cv=none; d=google.com; s=arc-20160816; b=gC0RvyXSYyH1CECRWF7/TreC8eIxcnkWv3vs4ZP3mzX1yDjobbp5p92Hq4qXjkruDq ldBGdDCLnHNK69RGBcddq7CQhGDACirecQHZ967UW1DKgRHrnsLdu58iIV2Imv/u+q+/ 4OZNbC4AddcJu7ek+eOCcVXgX5KULm6ZkI+u85Vz3gFACl8aFh8dBAP5qmam1cuNESSn 7oIls+OTyAV7SpBO0NEfYJ3ImHZOBpu3CqovamazcO65IKvpdsJFZY4sSKvEdlNkXJbZ EB85q94UIcwTTbu3kW4X+lqRpydbWayY0H55ACRQ+NB7yhnhmTmQZV+rHhwTzZT4w7n7 nUgw== 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=gddU9uoAd/WEL0t/eemZtLjgdVqgzrwsM6a1Lx2VmBw=; b=yTIkP4U/9e+9EVIjqpyGWOfVwK+lzlVWRPsd4JyZazFeAFItcnqrRXNLepSy0NXn7H S/0VgOwM903QjMGoAdRfVOyEz54MoPFVfpoclFJuv54mNANJzpqPNqN2fMuZuSqL8aXC 4zaHJ6HC7EYe7caV6eqSj/sN3rSgktKgvBbui/0XqTI0dOuuRIXJuahLaU+X1U1g/sTu zb9ZYQiWNyuMf7P3X8BMSkDvCkSZJgY1oabFe40z3J3YFzhBH9wAJHhsKYYTMCWJnEAj gIs7NNtUjFe4Mend5ZxsC87m96uDtCPv2g+MVtrrZNw8EURJzoelSOnIg/rno9WxdQuG sVow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WObBC+l2; 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 q9si12216936ejz.674.2021.04.19.07.26.10; Mon, 19 Apr 2021 07:26:10 -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=WObBC+l2; 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 5D81E68A0AE; Mon, 19 Apr 2021 17:17:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4096868A0E9 for ; Mon, 19 Apr 2021 17:16:56 +0300 (EEST) Received: by mail-io1-f51.google.com with SMTP id h141so26622798iof.2 for ; Mon, 19 Apr 2021 07:16:56 -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=9Wj3qHmE5JUn3MtJQWeC39U12zCStsMxY5hyIznsWN8=; b=WObBC+l24atfeat2kp3rsG33MugWeIH+nadIMDb+rLfqZTdAhpkZMQa3c+YJeqouoR 5QLAmK70DHgchUg0Yq2SZgbAEiFGbvUcW/hdYTSP+2yHpKWuKY0sZSla2O+wO3qbYi/V IZIZWUqwFwBMmTWfnbdgoa+Bak6peUcVSZ+xDcIgYC85obS/A1fEa54gt6QwQWKZM2s3 FTgbE92DRDVqYTlrQaxg5Tnud6UWhq1kxzT99tIWq1KHezRwx0exbZwo63CQH3JfcVIe ljOl+KwI2zmQt9eEIgiW+W253lLXse8WVn6aqPYLOPduGD6cDCMA7+tFd3pDV4GRLINr RN5g== 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=9Wj3qHmE5JUn3MtJQWeC39U12zCStsMxY5hyIznsWN8=; b=F9FHf3yofgNUVsp1grtSr28ivjWiHZ70ymMsaPV8cJyYQIqk6YhZdpeVZzNMZmUdO1 KExO04B4uVfxvwsrPTtivmmxSRiMPBF82MZEgEj17lFpXC6RuIkt8CU5o8JvvF1Mp6S0 nbN3xzJP66q+K+4nWRKvIyznkiRbyA8FpIEcHtycnWJMgQaszGh3ZbD4ABXix6koFqtT LE2g9c6lqQ3G00Vam+ZCDRWSJfEilcTSpvJpwGQTph4lCw4AQwDds6SmII3zSBI6hkN7 Vt/IxOR26ZufiXJrjuXgwtJoflEJ2QPSOG3PpxpVOyU6tsymwojPwmVvu9f74nF9iAYM 35Kg== X-Gm-Message-State: AOAM530rA+utELJWYfszSeL8O9RzyFUbc11mrsF1MpY4pR/VST9oW/UT ifKV/x4e2I0cMU78BOrm7uZLfCYzfJI= X-Received: by 2002:ac8:5d52:: with SMTP id g18mr12297574qtx.380.1618841467574; Mon, 19 Apr 2021 07:11:07 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:07 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:01 -0300 Message-Id: <20210419141024.8174-5-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 04/87] avcodec: Remove sidedata-only-packet cruft 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: ugsq3uHZxK6F From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 15 --------------- libavcodec/flacenc.c | 6 ------ libavcodec/options_table.h | 3 --- libavcodec/version.h | 3 --- 4 files changed, 27 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5e6967df0d..b46b858416 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2029,21 +2029,6 @@ typedef struct AVCodecContext { uint64_t vbv_delay; #endif -#if FF_API_SIDEDATA_ONLY_PKT - /** - * Encoding only and set by default. Allow encoders to output packets - * that do not contain any encoded data, only side data. - * - * Some encoders need to output such packets, e.g. to update some stream - * parameters at the end of encoding. - * - * @deprecated this field disables the default behaviour and - * it is kept only for compatibility. - */ - attribute_deprecated - int side_data_only_packets; -#endif - /** * Audio only. The number of "priming" samples (padding) inserted by the * encoder at the beginning of the audio. I.e. this number of leading diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 05a85d830f..38571ec9c9 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1370,13 +1370,7 @@ static int flac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, av_md5_final(s->md5ctx, s->md5sum); write_streaminfo(s, avctx->extradata); -#if FF_API_SIDEDATA_ONLY_PKT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->side_data_only_packets && !s->flushed) { -FF_ENABLE_DEPRECATION_WARNINGS -#else if (!s->flushed) { -#endif uint8_t *side_data = av_packet_new_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, avctx->extradata_size); if (!side_data) diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index e12159f734..956132437a 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -444,9 +444,6 @@ static const AVOption avcodec_options[] = { #if FF_API_OLD_ENCDEC {"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, A|V|D }, #endif -#if FF_API_SIDEDATA_ONLY_PKT -{"side_data_only_packets", NULL, OFFSET(side_data_only_packets), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, A|V|E }, -#endif {"apply_cropping", NULL, OFFSET(apply_cropping), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, V | D }, {"skip_alpha", "Skip processing alpha", OFFSET(skip_alpha), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, V|D }, {"field_order", "Field order", OFFSET(field_order), AV_OPT_TYPE_INT, {.i64 = AV_FIELD_UNKNOWN }, 0, 5, V|D|E, "field_order" }, diff --git a/libavcodec/version.h b/libavcodec/version.h index 1068716eb9..9b017d1980 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_CODED_FRAME #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_SIDEDATA_ONLY_PKT -#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_VDPAU_PROFILE #define FF_API_VDPAU_PROFILE (LIBAVCODEC_VERSION_MAJOR < 59) #endif