mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/mov: Append place name instead of overwriting for loci
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
4dd22531fd
commit
1607f77494
|
@ -206,7 +206,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)
|
static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len)
|
||||||
{
|
{
|
||||||
char language[4] = { 0 };
|
char language[4] = { 0 };
|
||||||
char buf[100];
|
char buf[200], place[100];
|
||||||
uint16_t langcode = 0;
|
uint16_t langcode = 0;
|
||||||
double longitude, latitude;
|
double longitude, latitude;
|
||||||
const char *key = "location";
|
const char *key = "location";
|
||||||
|
@ -221,7 +221,7 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len)
|
||||||
ff_mov_lang_to_iso639(langcode, language);
|
ff_mov_lang_to_iso639(langcode, language);
|
||||||
len -= 6;
|
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) {
|
if (len < 1) {
|
||||||
av_log(c->fc, AV_LOG_ERROR, "place name too long\n");
|
av_log(c->fc, AV_LOG_ERROR, "place name too long\n");
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
|
@ -237,7 +237,7 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len)
|
||||||
latitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16);
|
latitude = ((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/", latitude, longitude);
|
snprintf(buf, sizeof(buf), "%+08.4f%+09.4f/%s", latitude, longitude, 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);
|
||||||
|
|
Loading…
Reference in New Issue