diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-30 15:23:19 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2016-05-19 10:46:52 +0300 |
| commit | 94d8141c8cd96c176f7d4bdb74a95331ec7db19b (patch) | |
| tree | 40917b21812ff4c56e28f7d4fa148d10433abb9d | |
| parent | f126365cdad6327e6def8ceb918eaf538fbb97b3 (diff) | |
mov: Append place name instead of overwriting for loci
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 4d2b7b1740..b15e29037b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -221,7 +221,7 @@ static int mov_read_covr(MOVContext *c, AVIOContext *pb, int type, int len) static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len) { char language[4] = { 0 }; - char buf[100]; + char buf[200], place[100]; uint16_t langcode = 0; double longitude, latitude; const char *key = "location"; @@ -236,7 +236,7 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len) ff_mov_lang_to_iso639(langcode, language); len -= 6; - len -= avio_get_str(pb, len, buf, sizeof(buf)); // place name + len -= avio_get_str(pb, len, place, sizeof(place)); if (len < 1) { av_log(c->fc, AV_LOG_ERROR, "place name too long\n"); return AVERROR_INVALIDDATA; @@ -253,7 +253,7 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len) latitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16); // Try to output in the same format as the ?xyz field - snprintf(buf, sizeof(buf), "%+08.4f%+09.4f/", latitude, longitude); + snprintf(buf, sizeof(buf), "%+08.4f%+09.4f/%s", latitude, longitude, place); if (*language && strcmp(language, "und")) { char key2[16]; snprintf(key2, sizeof(key2), "%s-%s", key, language); |