[FFmpeg-devel] [PATCH] avformat: expose avlanguage.h

[Aman Gupta]

From: Aman Gupta <aman at tmm1.net>

Signed-off-by: Aman Gupta <aman at tmm1.net>
---
 doc/APIchanges           | 3 +++
 libavformat/Makefile     | 1 +
 libavformat/avlanguage.c | 2 --
 libavformat/avlanguage.h | 5 +----
 libavformat/version.h    | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 401c65a753..0cf9a6e2a3 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil:     2017-10-21
 
 API changes, most recent first:
 
+2019-11-26 - xxxxxxxxxx - lavf 58.36.100 - avlanguage.h
+  Add av_convert_lang_to().
+
 2019-11-17 - 1c23abc88f - lavu 56.36.100 - eval API
   Add av_expr_count_vars().
 
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 52f29b1a6d..7460f73fa2 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -3,6 +3,7 @@ DESC = FFmpeg container format library
 
 HEADERS = avformat.h                                                    \
           avio.h                                                        \
+          avlanguage.h                                                  \
           version.h                                                     \
 
 OBJS = allformats.o         \
diff --git a/libavformat/avlanguage.c b/libavformat/avlanguage.c
index f5d2ddf304..1673dc4726 100644
--- a/libavformat/avlanguage.c
+++ b/libavformat/avlanguage.c
@@ -764,9 +764,7 @@ 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..00f2b15f03 100644
--- a/libavformat/avlanguage.h
+++ b/libavformat/avlanguage.h
@@ -37,10 +37,7 @@ enum AVLangCodespace {
  * Convert a language code to a target codespace. The source codespace is guessed.
  * @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
+const char *ff_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace);
 
 #endif /* AVFORMAT_AVLANGUAGE_H */
diff --git a/libavformat/version.h b/libavformat/version.h
index bac54aed9d..f72fb9478a 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -32,7 +32,7 @@
 // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
 // Also please add any ticket numbers that you believe might be affected here
 #define LIBAVFORMAT_VERSION_MAJOR  58
-#define LIBAVFORMAT_VERSION_MINOR  35
+#define LIBAVFORMAT_VERSION_MINOR  36
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
-- 
2.20.1