mirror of https://git.ffmpeg.org/ffmpeg.git
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:
commit
817f8138cb
|
@ -89,7 +89,7 @@ int main(int argc, char *argv[])
|
|||
uint32_t atom_type = 0;
|
||||
uint64_t atom_size = 0;
|
||||
uint64_t atom_offset = 0;
|
||||
uint64_t last_offset;
|
||||
int64_t last_offset;
|
||||
unsigned char *moov_atom = NULL;
|
||||
unsigned char *ftyp_atom = NULL;
|
||||
uint64_t moov_atom_size;
|
||||
|
|
Loading…
Reference in New Issue