RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b' 

* commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b':
  qt-faststart: Fix the signedness of variables keeping the ftello return values

Conflicts:
	tools/qt-faststart.c

See: 1838961357
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-01 14:10:49 +01:00
parent 11c4bc9a74 03c2a66fcf
commit 817f8138cb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/qt-faststart.c
View File

@ -89,7 +89,7 @@ int main(int argc, char *argv[])
uint32_t atom_type = 0; uint32_t atom_type = 0;
uint64_t atom_size = 0; uint64_t atom_size = 0;
uint64_t atom_offset = 0; uint64_t atom_offset = 0;
uint64_t last_offset; int64_t last_offset;
unsigned char *moov_atom = NULL; unsigned char *moov_atom = NULL;
unsigned char *ftyp_atom = NULL; unsigned char *ftyp_atom = NULL;
uint64_t moov_atom_size; uint64_t moov_atom_size;