From patchwork Mon Apr 19 14:10:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27062 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp563449iob; Mon, 19 Apr 2021 07:20:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMpIpaz+ijGTSlv1QE/zs0h4f0qOIxmczIpjDTifDOdWnA64z7lE7OjyXLaJjIDcpCVn8m X-Received: by 2002:a17:906:f42:: with SMTP id h2mr22896917ejj.317.1618842048518; Mon, 19 Apr 2021 07:20:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842048; cv=none; d=google.com; s=arc-20160816; b=Jj3nvZQpvVU6/BGbimw4wkN4HwxNIlnpwLxnbw4Yf1rt8qALUh98Blmcv9EGPOl+L9 AK+ZCxkdlUfXwl3AP1Ye+H2DzhynpDsHUYgs44y9DA11JnAQ4c2yGfNmazbSHsVujOE+ ZDzr29smOxX4U6BRZN/KnO0Pn+ErJ7g7U8Z9n2Fk5B4bx4Tqm9YzI/r9vcp/CK+kWpkc 3sfvp6IQQ0fMbtnOwUwN9/kNMO+Z/beoBH5D9tTMr5vZxsruaWowqfqGT0+ndYIA40Js JchuA5idWs7tNDwvHMd6vVIrGOX9gObn8cBYyJuz8ycUgkW2IvBEtR4EA33AZzf8r3cE KCOw== 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=bWUgjp3awO/JReDbjzeKugFwe1zoQqzYmmOdQThTl1g=; b=wkSsmpyY/U2c2lbV3Z6/plE6FZbbEN/VY4R/DfSAcO+w1uSUx8/3vjC4cjL3Sy63T8 /jujAAk27EtNXP83rTOCFwPzd02OvB38I2KWk2zDm7s3gRDz/aL8rp7Otvtvda38BgCG +QlO5UYUR4muwWY5YSiWQjMmQyAZAoV0qJI43RJ32a6weyT3AOkzUmn0tGIPKTC1uVdM OGTE5QvrGL1mbCaCku0NLBne2E2JWjz0tZD4vxTWL4yaUmPmGEoigIxo4Yz5oW3svxAn ryHEvaLIT3pGBOyYxqUYoSOjzXSIW0Z3xkr+d3OLTk9ebpglQUEjDlR9v3M/PDYlzw+t fffA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="t//NW4uG"; 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 y25si9439391ejb.256.2021.04.19.07.20.48; Mon, 19 Apr 2021 07:20:48 -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="t//NW4uG"; 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 1DEE2689BD5; Mon, 19 Apr 2021 17:12:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F98E689AFD for ; Mon, 19 Apr 2021 17:12:22 +0300 (EEST) Received: by mail-qk1-f176.google.com with SMTP id t17so7382660qkg.4 for ; Mon, 19 Apr 2021 07:12:21 -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=dggSBS0HyjE6URkknUZU2/n8BRTT+UEAtdnWQrFmL5Y=; b=t//NW4uGggCNGOJF2hi22CLiAeomzkXpGbo7NRSBkCsO/VeQqAZ5X+tZa25fygx7oS wgq3G/0R/ok1LoYke6mIaqn/NOZy6O8MBa1WucAxJudZsIhTD9k3Wu+di9MVN94sRUtP gBuxY5VM2jfWWRYISOBKp3MRCbML6zVTaxYAb1xLI4J20JRKsIuVvANbEBAJdpn7JB7j POlAMOotr1lbrG2YdRoMN8SU7zCh1C2s3RclgqLgqfbTyXohBbR5/cP08WK9B2CuinbF aDY0nprFqvULQYjuszTsBViatwf7GsxJ9LnD16t+6p0y8+kN+W4D9vhKnITvI3KmjISq XV3g== 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=dggSBS0HyjE6URkknUZU2/n8BRTT+UEAtdnWQrFmL5Y=; b=fwi1SHtNr0jQlFWs2DUthPTcCXpsyAZ7Vfq2a20Arn6xbv+UkBPPyEQc5yBxjH3J4X qrC0ZhCUuz8KYtZSTVqyRD9gIqvMNAgqxY64fxqKRStNFygzfPoICnPxlya5pvBsKHfQ tDAV/6CsFu5sy+LDWZeJiPpJ88EEs8oY8sVs3rjGbvz93xS4KfxsoC1FduT5obAKq79p 0W6zPQb232YT2gfs21SM6Ww6AmAEI0Oc4ESjaHJJQILoths4KmNTez2IkL2qV1iQqhuR 0PJSRExqzi6IKRk4RjRJgiBEci6m7hRb8Adv/p52iDUC7N2IG5vU605SPSYNKp51mEc+ DcnQ== X-Gm-Message-State: AOAM531BaDSFb/aWdymQHH7Xhx1HxqZoHeTNnN35+vpc2Zdgdo2QGntZ erIkRW8+RT3ZnZOn2T6C6NWNtXy9MvQ= X-Received: by 2002:a37:a98e:: with SMTP id s136mr3484054qke.16.1618841540694; Mon, 19 Apr 2021 07:12:20 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:20 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:10:02 -0300 Message-Id: <20210419141024.8174-66-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 65/87] avutil/frame: Remove deprecated AVFrame.error 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: pBtWcm9Q3uxZ From: Andreas Rheinhardt Deprecated in 1aa24df74c052a73175c43e57d35b4835e537ec8. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 7 ------- libavcodec/snowenc.c | 6 ------ libavfilter/vf_swapuv.c | 6 ------ libavutil/frame.c | 6 ------ libavutil/frame.h | 8 -------- libavutil/version.h | 3 --- 6 files changed, 36 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 0aa94dc7d8..f50f6cdeff 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1604,13 +1604,6 @@ static void frame_end(MpegEncContext *s) s->last_lambda_for [s->pict_type] = s->current_picture_ptr->f->quality; if (s->pict_type!= AV_PICTURE_TYPE_B) s->last_non_b_pict_type = s->pict_type; - -#if FF_API_ERROR_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - memcpy(s->current_picture.f->error, s->current_picture.encoding_error, - sizeof(s->current_picture.encoding_error)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif } static void update_noise_reduction(MpegEncContext *s) diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 255968341a..e694d51a67 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1865,12 +1865,6 @@ redo_frame: (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? 4 : 0, s->current_picture->pict_type); -#if FF_API_ERROR_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - memcpy(s->current_picture->error, s->encoding_error, sizeof(s->encoding_error)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - pkt->size = ff_rac_terminate(c, 0); if (s->current_picture->key_frame) pkt->flags |= AV_PKT_FLAG_KEY; diff --git a/libavfilter/vf_swapuv.c b/libavfilter/vf_swapuv.c index 8d62c48c4f..720e699c4a 100644 --- a/libavfilter/vf_swapuv.c +++ b/libavfilter/vf_swapuv.c @@ -46,12 +46,6 @@ static void do_swap(AVFrame *frame) FFSWAP(uint8_t*, frame->data[1], frame->data[2]); FFSWAP(int, frame->linesize[1], frame->linesize[2]); FFSWAP(AVBufferRef*, frame->buf[1], frame->buf[2]); - -#if FF_API_ERROR_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - FFSWAP(uint64_t, frame->error[1], frame->error[2]); -FF_ENABLE_DEPRECATION_WARNINGS -#endif } static AVFrame *get_video_buffer(AVFilterLink *link, int w, int h) diff --git a/libavutil/frame.c b/libavutil/frame.c index df826fbfb7..d69dd38dc4 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -316,12 +316,6 @@ FF_ENABLE_DEPRECATION_WARNINGS av_dict_copy(&dst->metadata, src->metadata, 0); -#if FF_API_ERROR_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - memcpy(dst->error, src->error, sizeof(dst->error)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - for (i = 0; i < src->nb_side_data; i++) { const AVFrameSideData *sd_src = src->side_data[i]; AVFrameSideData *sd_dst; diff --git a/libavutil/frame.h b/libavutil/frame.h index fbecebbd70..23396189d9 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -434,14 +434,6 @@ typedef struct AVFrame { */ void *opaque; -#if FF_API_ERROR_FRAME - /** - * @deprecated unused - */ - attribute_deprecated - uint64_t error[AV_NUM_DATA_POINTERS]; -#endif - /** * When decoding, this signals how much the picture must be delayed. * extra_delay = repeat_pict / (2*fps) diff --git a/libavutil/version.h b/libavutil/version.h index 2eb3d3c756..a72788d8e4 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_ERROR_FRAME -#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_PKT_PTS #define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57) #endif