mxfenc: always assume long gop

[ffmpeg] / libavformat / avlanguage.c

diff --git a/libavformat/avlanguage.c b/libavformat/avlanguage.c
index 3b778124b6d3f7f5c02feea377263b1d6cbaabe6..e606ef22f9bc46c10640d655342ac5d4527ae346 100644 (file)
--- a/libavformat/avlanguage.c
+++ b/libavformat/avlanguage.c
@@ -1,25 +1,26 @@
 /*
  * Cyril Comparon, Larbi Joubala, Resonate-MP4 2009
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "avlanguage.h"
 #include "libavutil/avstring.h"
+#include "libavutil/common.h"
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
@@ -29,10 +30,10 @@ typedef struct LangEntry {
     uint16_t next_equivalent;
 } LangEntry;
 
-const uint16_t lang_table_counts[] = { 484, 20, 184 };
-const uint16_t lang_table_offsets[] = { 0, 484, 504 };
+static const uint16_t lang_table_counts[] = { 484, 20, 184 };
+static const uint16_t lang_table_offsets[] = { 0, 484, 504 };
 
-static LangEntry lang_table[] = {
+static const LangEntry lang_table[] = {
     /*----- AV_LANG_ISO639_2_BIBL entries (484) -----*/
     /*0000*/ { "aar",  504 },
     /*0001*/ { "abk",  505 },
@@ -736,9 +737,9 @@ const char *av_convert_lang_to(const char *lang, enum AVLangCodespace target_cod
 {
     int i;
     const LangEntry *entry = NULL;
-    const int NB_CODESPACES = sizeof(lang_table_counts)/sizeof(*lang_table_counts);
+    const int NB_CODESPACES = FF_ARRAY_ELEMS(lang_table_counts);
 
-    if (target_codespace < 0 || target_codespace >= NB_CODESPACES)
+    if (target_codespace >= NB_CODESPACES)
         return NULL;
 
     for (i=0; !entry && i<NB_CODESPACES; i++)