[SCM] libav/experimental: qt-faststart: Fix the signedness of variables keeping the ftello return values

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:01:46 UTC 2014


The following commit has been merged in the experimental branch:
commit 03c2a66fcff9707f71ffef7e61ce5e3973220d4b
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Oct 29 22:05:33 2012 +0100

    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 at martin.st>

diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c
index 0abcd2b..2b2e00c 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;
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list