diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 14:10:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 14:12:39 +0100 |
| commit | 817f8138cb3ef14cc6be1634d4ddd01b510c16e6 (patch) | |
| tree | f4d114eb998ff39ef52ba6c94baf361dbf8c9548 /tools | |
| parent | 11c4bc9a744b16b5c297b7d302c9abac1b34b689 (diff) | |
| parent | 03c2a66fcff9707f71ffef7e61ce5e3973220d4b (diff) | |
| download | ffmpeg-streaming-817f8138cb3ef14cc6be1634d4ddd01b510c16e6.zip ffmpeg-streaming-817f8138cb3ef14cc6be1634d4ddd01b510c16e6.tar.gz | |
Merge commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b'
* commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b':
qt-faststart: Fix the signedness of variables keeping the ftello return values
Conflicts:
tools/qt-faststart.c
See: 1838961357e38402be64c0c82a2f08e4e85a0c01
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qt-faststart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c index fc82aba..9fb27bc 100644 --- a/tools/qt-faststart.c +++ b/tools/qt-faststart.c @@ -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; |
