From patchwork Thu Feb 25 17:33:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25991 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D232044A93D for ; Thu, 25 Feb 2021 19:33:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A26DA689E8A; Thu, 25 Feb 2021 19:33:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DE77680518 for ; Thu, 25 Feb 2021 19:33:14 +0200 (EET) Received: by mail-wr1-f51.google.com with SMTP id w11so6039640wrr.10 for ; Thu, 25 Feb 2021 09:33:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gVc3Oc+/ngW9+g9q1hatm8Thzf8dof/v2X3PaCAWg1c=; b=uXth9M3kmknd8IHCcU5Cw6whBMFSBjVLQXfEqDrJ+Q5ymvjH7q6h3uDei53wuM4lLB gX8SoOKd5CdM2l+CiGHSqWpZrCoPHAmqQh3sRChuovDLki/WVNpeQfJM78YcxgvHe2gK 8m8lqEUy/fX6YPrhhjBpOlzQ4AVS+IxDfclLCwm6NEdkibVSNF2y9T2GVDVBnMRwrbZn s4pZQRIQpjMJC+U6NPA3Pb+GUHnnHSC9cSNbPZzDOobNPbiOg1BW34t2Q00AREx+Tzbc WfJWR1eDx2WWs1xA7D1ljgnnQpxqjd58oxKVXQDRvLzj4Dorlqma7H1flVt3EElo8A4L umbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gVc3Oc+/ngW9+g9q1hatm8Thzf8dof/v2X3PaCAWg1c=; b=YbKhd0OY/T7Z1HKlzCvR88TnQufXA8lh/08RzfxLwUr2YaxGaJXj10QiC/veb/4r6L lEJmCjtpGDasG6622VZSkU4S00Yo005KW05AJFWLeckv9wqRqQeppVlJ2EFtne9lN84p F6sK5D5Tizm0l69sb96erFT/5jnNYnMHygAPCuhQCPKEWjqrOOD14rYqL8APSKXN/x96 MPsl6v5c18IBvVl8QoD5i6Xv5q8WYe0zxG+aA5ahEJEGnqqJvNLbIlj/4WCS70utGczt jvwJSLmRWR28dMeLNze6IBSdPBGIntFHGHibc8EtVbKNmBZA6n6mUln7mEKyRTKdwlJa qA4A== X-Gm-Message-State: AOAM53323q8TE7iJ5ndxiExENrFU98W3gdp2rx7lhOA4o94LeTtWpl4n 4QA+itPV2KevXJNwymHjjbFC1b1cxWo= X-Google-Smtp-Source: ABdhPJx11Eysl6zgu4YR6d07iIMr8YyrADJ16ykYtxW9p2rSaLItXRFXcMSYy2HdN9/adV1Uzo6sWw== X-Received: by 2002:adf:8445:: with SMTP id 63mr4705620wrf.222.1614274393535; Thu, 25 Feb 2021 09:33:13 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id n1sm10407889wrx.45.2021.02.25.09.33.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Feb 2021 09:33:13 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Feb 2021 18:33:06 +0100 Message-Id: <20210225173306.1412317-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/avlanguage: Remove long disabled av_convert_lang_to X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 1582e306a47977b09fddb029b999f99eb03cd485 slated it for removal with libavformat major version 58, but it was never removed. Signed-off-by: Andreas Rheinhardt --- libavformat/avlanguage.c | 7 ------- libavformat/avlanguage.h | 7 ------- 2 files changed, 14 deletions(-) diff --git a/libavformat/avlanguage.c b/libavformat/avlanguage.c index f5d2ddf304..c36893c999 100644 --- a/libavformat/avlanguage.c +++ b/libavformat/avlanguage.c @@ -763,10 +763,3 @@ const char *ff_convert_lang_to(const char *lang, enum AVLangCodespace target_cod return NULL; } - -#if LIBAVFORMAT_VERSION_MAJOR < 58 -const char *av_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace) -{ - return ff_convert_lang_to(lang, target_codespace); -} -#endif diff --git a/libavformat/avlanguage.h b/libavformat/avlanguage.h index 1d72dcb3cb..1901e78407 100644 --- a/libavformat/avlanguage.h +++ b/libavformat/avlanguage.h @@ -21,9 +21,6 @@ #ifndef AVFORMAT_AVLANGUAGE_H #define AVFORMAT_AVLANGUAGE_H -#include "libavutil/attributes.h" -#include "libavformat/version.h" - /** * Known language codespaces */ @@ -38,9 +35,5 @@ enum AVLangCodespace { * @return NULL if the provided lang is null or invalid. */ const char *ff_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace); -#if LIBAVFORMAT_VERSION_MAJOR < 58 -attribute_deprecated -const char *av_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace); -#endif #endif /* AVFORMAT_AVLANGUAGE_H */