From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5EE5445038 for ; Thu, 25 Jan 2024 13:45:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 966C968D145; Thu, 25 Jan 2024 15:44:49 +0200 (EET) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6112168D103 for ; Thu, 25 Jan 2024 15:44:39 +0200 (EET) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1d51ba18e1bso61539725ad.0 for ; Thu, 25 Jan 2024 05:44:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706190277; x=1706795077; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=p+ibMIu/FAwsavBjqDF7L1m/qV9esMSzHd/dbiqi1xI=; b=etl8QbPW7jLtIvvOCEsfeHaYFZ42/1R6L94W2ESiiQrkaA/Fd2JDEpmvElrxc3J+he O33GONf7B3TMB5foNJ+h4qMpRETch+lYc6x5t0zEnLHKjsyUemwEDseljWxGPK8DYHem uMq6Kx2U2GSuvpzCGoYV43Auep8cpt1k6mgZSm8ZGTdojsurEFSVntVZE0z5nErcIBpN nmBqwDGVDqxisUu0KKweKDZ++2KMRsz1dnuakdS2sL7vsoYVULdlsP5dcWVHB3rCFxvs t3hGde6auMqjzIAF+k8yfHOeY7C099Iu1GlhtOnilQUXMXu5G+uu2WdPVbcAxnbd9oGQ Aszw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706190277; x=1706795077; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p+ibMIu/FAwsavBjqDF7L1m/qV9esMSzHd/dbiqi1xI=; b=bimQwTsIKoIVhSHhh6JOceHurIQFZsnVcwq8GeAO+4QmjOlgdH4OvHQwQ5VtSs9mLo tB++9aFdmd6NGPFKmqFCo5ruXiswunDnGCkyNmxMmt89hVe/VH1zV+Z0q6ylAmHXoRb0 iM+pfKcmrWC7O6v/vFas034V51znJKCEdoe2EoBFNE4KHPpWxBB+OMTMoKvQGNSiwv3B HRgVhNbVvMIKYlbWI2f5ClCocr+WvcZ5LmrRIAfssO1kB4JCF2zJL5uzGIf/v/TjIp24 Qm+QN0UnJjHPVhW7j4shD2cA3jLdLqYPWbJS3yRLtrX/6bhjjCZsyWXI0LgHcDQncMWJ M7Rw== X-Gm-Message-State: AOJu0Yxf1GZY8zVVkHZNRhw6FomOirVI5B1clPqceQX8YqlIxG5asGF0 ev+Hw7EVeeutFPlHNoneoy/DG1y4HhSpq7wgvgP6YAxzeizJ40mWWp45NMa9 X-Google-Smtp-Source: AGHT+IFGS66VRLnx94ZGAkmS4Z08MYUu19XYqVCm7m2miobjsniT9n3ZcYtItEDfVCODR0EpG56wXg== X-Received: by 2002:a17:903:183:b0:1d7:8237:f770 with SMTP id z3-20020a170903018300b001d78237f770mr1404029plg.17.1706190277235; Thu, 25 Jan 2024 05:44:37 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id k17-20020a170902f29100b001d707a14316sm11785146plc.75.2024.01.25.05.44.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 05:44:36 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jan 2024 10:43:28 -0300 Message-ID: <20240125134425.374-6-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240125134425.374-1-jamrial@gmail.com> References: <20240125134425.374-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/24] avcodec: remove deprecated FF_API_AVCODEC_CHROMA_POS 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- libavcodec/avcodec.h | 28 ---------------------------- libavcodec/utils.c | 11 ----------- libavcodec/version_major.h | 1 - 3 files changed, 40 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4b2ef4fdf7..2dd9c5c82b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2471,34 +2471,6 @@ void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height); void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int linesize_align[AV_NUM_DATA_POINTERS]); -#ifdef FF_API_AVCODEC_CHROMA_POS -/** - * Converts AVChromaLocation to swscale x/y chroma position. - * - * The positions represent the chroma (0,0) position in a coordinates system - * with luma (0,0) representing the origin and luma(1,1) representing 256,256 - * - * @param xpos horizontal chroma sample position - * @param ypos vertical chroma sample position - * @deprecated Use av_chroma_location_enum_to_pos() instead. - */ - attribute_deprecated -int avcodec_enum_to_chroma_pos(int *xpos, int *ypos, enum AVChromaLocation pos); - -/** - * Converts swscale x/y chroma position to AVChromaLocation. - * - * The positions represent the chroma (0,0) position in a coordinates system - * with luma (0,0) representing the origin and luma(1,1) representing 256,256 - * - * @param xpos horizontal chroma sample position - * @param ypos vertical chroma sample position - * @deprecated Use av_chroma_location_pos_to_enum() instead. - */ - attribute_deprecated -enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos); -#endif - /** * Decode a subtitle message. * Return a negative value on error, otherwise return the number of bytes used. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 39b83c7791..1ad91c3237 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -362,17 +362,6 @@ void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height) align = FFMAX3(align, linesize_align[1], linesize_align[2]); *width = FFALIGN(*width, align); } -#if FF_API_AVCODEC_CHROMA_POS -int avcodec_enum_to_chroma_pos(int *xpos, int *ypos, enum AVChromaLocation pos) -{ - return av_chroma_location_enum_to_pos(xpos, ypos, pos); -} - -enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos) -{ - return av_chroma_location_pos_to_enum(xpos, ypos); -} -#endif int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, enum AVSampleFormat sample_fmt, const uint8_t *buf, diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index b364ba68f1..88cc975713 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -38,7 +38,6 @@ */ #define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 61) -#define FF_API_AVCODEC_CHROMA_POS (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_VT_HWACCEL_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_AVCTX_FRAME_NUMBER (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_SLICE_OFFSET (LIBAVCODEC_VERSION_MAJOR < 61) -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".