[FFmpeg-cvslog] r22368 - trunk/libavformat/movenc.c

[bcoudurier]

Author: bcoudurier
Date: Tue Mar  9 02:21:09 2010
New Revision: 22368

Log:
Correctly mark mov metadata as utf-8, using iso language code

Modified:
   trunk/libavformat/movenc.c

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	Tue Mar  9 02:20:20 2010	(r22367)
+++ trunk/libavformat/movenc.c	Tue Mar  9 02:21:09 2010	(r22368)
@@ -1390,11 +1390,13 @@ static int mov_write_string_metadata(AVF
     while ((t2 = av_metadata_get(s->metadata, tag2, t2, AV_METADATA_IGNORE_SUFFIX))) {
         len2 = strlen(t2->key);
         if (len2 == len+4 && !strcmp(t->value, t2->value)
-            && (l=ff_mov_iso639_to_lang(&t2->key[len2-3], 0)) >= 0) {
+            && (l=ff_mov_iso639_to_lang(&t2->key[len2-3], 1)) >= 0) {
             lang = l;
             break;
         }
     }
+    if (!lang)
+        lang = ff_mov_iso639_to_lang("und", 1);
     return mov_write_string_tag(pb, name, t->value, lang, long_style);
 }