[FFmpeg-devel] [PATCH] avformat/avlanguage: Remove long disabled av_convert_lang_to

[Andreas Rheinhardt]

1582e306a47977b09fddb029b999f99eb03cd485 slated it for removal with
libavformat major version 58, but it was never removed.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
---
 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 */
-- 
2.27.0