aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-29 22:05:33 +0100
committerReinhard Tartler <siretart@tauware.de>2014-03-02 11:42:36 -0500
commit298d66c8de1d4faa152f4ef557566aa0519223d8 (patch)
treee2c9499753b030cbdaa41d6dee6a5df0ad582562
parent92edc13d69188de1f12197996334c1cc6e2d12c5 (diff)
downloadffmpeg-298d66c8de1d4faa152f4ef557566aa0519223d8.tar.gz
qt-faststart: Fix the signedness of variables keeping the ftello return values
These variables are assigned the return values of ftello, which returns an off_t, which is a signed type. On errors, ftello returns -1, thus make sure this error return value can be stored properly. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 03c2a66fcff9707f71ffef7e61ce5e3973220d4b)
-rw-r--r--tools/qt-faststart.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c
index 0abcd2b67c..2b2e00ca57 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;
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
uint64_t i, j;
uint32_t offset_count;
uint64_t current_offset;
- uint64_t start_offset = 0;
+ int64_t start_offset = 0;
unsigned char copy_buffer[COPY_BUFFER_SIZE];
int bytes_to_copy;