Merge commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 13:10:49 +0000 (14:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 13:12:39 +0000 (14:12 +0100)
* 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>
1  2 
tools/qt-faststart.c

Simple merge