# HG changeset patch
# User aurel
# Date 1199664199 0
# Node ID 616fb87724b52087d7023fa1a766eadbeb9f3966
# Parent  72e3c40f0fb2d4f387ebc20bb818a53ca97e7c80
Make ff_mkv_codec_tags lie entirely in .rodata section.
From: Diego 'Flameeyes' Petten��� < flameeyes _at_ gmail _dot_ com >

diff -r 72e3c40f0fb2 -r 616fb87724b5 matroska.c
--- a/matroska.c	Sun Jan 06 22:50:09 2008 +0000
+++ b/matroska.c	Mon Jan 07 00:03:19 2008 +0000
@@ -68,6 +68,6 @@
     {"S_SSA"            , CODEC_ID_SSA},
     {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
 
-    {NULL               , CODEC_ID_NONE}
+    {""                 , CODEC_ID_NONE}
 /* TODO: AC3-9/10 (?), Real, Musepack, Quicktime */
 };
diff -r 72e3c40f0fb2 -r 616fb87724b5 matroska.h
--- a/matroska.h	Sun Jan 06 22:50:09 2008 +0000
+++ b/matroska.h	Mon Jan 07 00:03:19 2008 +0000
@@ -181,7 +181,7 @@
  */
 
 typedef struct CodecTags{
-    const char *str;
+    char str[16];
     enum CodecID id;
 }CodecTags;
 
diff -r 72e3c40f0fb2 -r 616fb87724b5 matroskadec.c
--- a/matroskadec.c	Sun Jan 06 22:50:09 2008 +0000
+++ b/matroskadec.c	Mon Jan 07 00:03:19 2008 +0000
@@ -2048,7 +2048,7 @@
             if (track->codec_id == NULL)
                 continue;
 
-            for(j=0; ff_mkv_codec_tags[j].str; j++){
+            for(j=0; ff_mkv_codec_tags[j].id != CODEC_ID_NONE; j++){
                 if(!strncmp(ff_mkv_codec_tags[j].str, track->codec_id,
                             strlen(ff_mkv_codec_tags[j].str))){
                     codec_id= ff_mkv_codec_tags[j].id;