lavf/matroskaenc: move skipped metadata keys to separate function

[ffmpeg] / libavformat / avlanguage.h

diff --git a/libavformat/avlanguage.h b/libavformat/avlanguage.h
index 7fb8968810fb229522e00955d8f26a8e0d53f12d..1d72dcb3cb6d8b46e36ab40581150a5679c58ac0 100644 (file)
--- a/libavformat/avlanguage.h
+++ b/libavformat/avlanguage.h
@@ -21,12 +21,15 @@
 #ifndef AVFORMAT_AVLANGUAGE_H
 #define AVFORMAT_AVLANGUAGE_H
 
+#include "libavutil/attributes.h"
+#include "libavformat/version.h"
+
 /**
  * Known language codespaces
  */
 enum AVLangCodespace {
     AV_LANG_ISO639_2_BIBL, /** 3-char bibliographic language codes as per ISO-IEC 639-2 */
-    AV_LANG_ISO639_2_TERM, /** 3-char terminologic language codes as per ISO-IEC 639-2 */
+    AV_LANG_ISO639_2_TERM, /** 3-char terminological language codes as per ISO-IEC 639-2 */
     AV_LANG_ISO639_1       /** 2-char code of language as per ISO/IEC 639-1 */
 };
 
@@ -34,6 +37,10 @@ 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
 
 #endif /* AVFORMAT_AVLANGUAGE_H */