[FFmpeg-cvslog] Merge commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  1 14:10:49 2014 +0100| [817f8138cb3ef14cc6be1634d4ddd01b510c16e6] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=817f8138cb3ef14cc6be1634d4ddd01b510c16e6
---