From 1c90d2985d5f4ca5dd74459712109b7438e4c9bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Sat, 30 Jan 2010 21:54:06 +0000
Subject: [PATCH] Always consider the mov language code as 4 bytes fixed size
and change the function declaration to reflect this.
Originally committed as revision 21558 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/isom.c | 5 +++--
libavformat/isom.h | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/libavformat/isom.c b/libavformat/isom.c
index e54a5c96860..62daed08af9 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -266,7 +266,7 @@ static const char * const mov_mdhd_language_map[] = {
"cat", "lat", "que", "grn", "aym", "tat", "uig", "dzo", "jav"
};
-int ff_mov_iso639_to_lang(const char *lang, int mp4)
+int ff_mov_iso639_to_lang(const char lang[4], int mp4)
{
int i, code = 0;
@@ -293,9 +293,10 @@ int ff_mov_iso639_to_lang(const char *lang, int mp4)
return code;
}
-int ff_mov_lang_to_iso639(unsigned code, char *to)
+int ff_mov_lang_to_iso639(unsigned code, char to[4])
{
int i;
+ memset(to, 0, 4);
/* is it the mangled iso code? */
/* see http://www.geocities.com/xhelmboyx/quicktime/formats/mp4-layout.txt */
if (code > 138) {
diff --git a/libavformat/isom.h b/libavformat/isom.h
index c8141f13cde..2661e8d6207 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -34,8 +34,8 @@ extern const AVCodecTag codec_movvideo_tags[];
extern const AVCodecTag codec_movaudio_tags[];
extern const AVCodecTag ff_codec_movsubtitle_tags[];
-int ff_mov_iso639_to_lang(const char *lang, int mp4);
-int ff_mov_lang_to_iso639(unsigned code, char *to);
+int ff_mov_iso639_to_lang(const char lang[4], int mp4);
+int ff_mov_lang_to_iso639(unsigned code, char to[4]);
/* the QuickTime file format is quite convoluted...
* it has lots of index tables, each indexing something in another one...
--
GitLab