generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mov: Also export loci altitude

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Michael Niedermayer 2015-05-30 15:28:31 +02:00 committed by Martin Storsjö
parent 94d8141c8c
commit bc43131997
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/mov.c
View File

@ -223,7 +223,7 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len)
char language[4] = { 0 }; char language[4] = { 0 };
char buf[200], place[100]; char buf[200], place[100];
uint16_t langcode = 0; uint16_t langcode = 0;
double longitude, latitude; double longitude, latitude, altitude;
const char *key = "location"; const char *key = "location";
if (len < 4 + 2 + 1 + 1 + 4 + 4 + 4) { 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); longitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16);
latitude = ((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 // 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")) { if (*language && strcmp(language, "und")) {
char key2[16]; char key2[16];
snprintf(key2, sizeof(key2), "%s-%s", key, language); snprintf(key2, sizeof(key2), "%s-%s", key, language);