diff options
Diffstat (limited to 'libavformat/avlanguage.c')
| -rw-r--r-- | libavformat/avlanguage.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libavformat/avlanguage.c b/libavformat/avlanguage.c index e606ef22f9..f5d2ddf304 100644 --- a/libavformat/avlanguage.c +++ b/libavformat/avlanguage.c @@ -1,20 +1,20 @@ /* * Cyril Comparon, Larbi Joubala, Resonate-MP4 2009 * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -733,7 +733,7 @@ static int lang_table_compare(const void *lhs, const void *rhs) return strcmp(lhs, ((const LangEntry *)rhs)->str); } -const char *av_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace) +const char *ff_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace) { int i; const LangEntry *entry = NULL; @@ -759,7 +759,14 @@ const char *av_convert_lang_to(const char *lang, enum AVLangCodespace target_cod entry = lang_table + entry->next_equivalent; if (target_codespace == AV_LANG_ISO639_2_TERM) - return av_convert_lang_to(lang, AV_LANG_ISO639_2_BIBL); + return ff_convert_lang_to(lang, AV_LANG_ISO639_2_BIBL); 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 |