virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'

Browse Source 
* commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294':
  mov: Remove a variable that is set but never used

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-08 21:53:09 +02:00
commit fd3388d63d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/mov.c
View File

@ -227,7 +227,7 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len)
char language[4] = { 0 }; char language[4] = { 0 };
char buf[100]; char buf[100];
uint16_t langcode = 0; uint16_t langcode = 0;
av_unused double longitude, latitude, altitude; double longitude, latitude;
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)
@ -248,7 +248,6 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
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/", latitude, longitude); snprintf(buf, sizeof(buf), "%+08.4f%+09.4f/", latitude, longitude);