diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 21:53:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 21:53:09 +0200 |
| commit | fd3388d63d8e379c484d69f4b32a0becbebad78b (patch) | |
| tree | 9ba6c8675beaf649bc208d5eaf545149fb97cb9c /libavformat | |
| parent | 839688bc63e1581dd82e8e51b7fb0c982a483876 (diff) | |
| parent | 18fb38fb9ea7e2d5997c096fccfcd4cb43f70294 (diff) | |
| download | ffmpeg-fd3388d63d8e379c484d69f4b32a0becbebad78b.tar.gz | |
Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'
* commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294':
mov: Remove a variable that is set but never used
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 89ecc5400b..85dc5cf47a 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -227,7 +227,7 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len) char language[4] = { 0 }; char buf[100]; uint16_t langcode = 0; - av_unused double longitude, latitude, altitude; + double longitude, latitude; const char *key = "location"; if (len < 4 + 2 + 1 + 1 + 4 + 4 + 4) @@ -248,7 +248,6 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len) return AVERROR_INVALIDDATA; 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/", latitude, longitude); |