Module: libav Branch: master Commit: bc43131997a456ecdff160eab288395f5adb8d72
Author: Michael Niedermayer <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Sat May 30 15:28:31 2015 +0200 mov: Also export loci altitude Signed-off-by: Martin Storsjö <[email protected]> --- libavformat/mov.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index b15e290..125919f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -223,7 +223,7 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len) char language[4] = { 0 }; char buf[200], place[100]; uint16_t langcode = 0; - double longitude, latitude; + double longitude, latitude, altitude; const char *key = "location"; if (len < 4 + 2 + 1 + 1 + 4 + 4 + 4) { @@ -251,9 +251,14 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len) } longitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16); latitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16); + altitude = ((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/%s", latitude, longitude, place); + snprintf(buf, sizeof(buf), "%+08.4f%+09.4f", latitude, longitude); + if (altitude) + av_strlcatf(buf, sizeof(buf), "%+f", altitude); + av_strlcatf(buf, sizeof(buf), "/%s", place); + if (*language && strcmp(language, "und")) { char key2[16]; snprintf(key2, sizeof(key2), "%s-%s", key, language); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
