Merge commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475'

* commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475':
  qt-faststart: Check fseeko() return codes

Conflicts:
	tools/qt-faststart.c

See: 0de41ead6f9034e0a834abe51028a02aee094990
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc tools/qt-faststart.c
index ffaeac0,0abcd2b..fc82aba
--- 1/tools/qt-faststart.c
--- 2/tools/qt-faststart.c
+++ b/tools/qt-faststart.c
@@@ -137,9 -136,8 +137,9 @@@ int main(int argc, char *argv[]
                         atom_size);
                  goto error_out;
              }
-             if (   fseeko(infile, -ATOM_PREAMBLE_SIZE, SEEK_CUR)
-                 || fread(ftyp_atom, atom_size, 1, infile) != 1
-                 || (start_offset = ftello(infile))<0) {
+             if (fseeko(infile, -ATOM_PREAMBLE_SIZE, SEEK_CUR) ||
 -                fread(ftyp_atom, atom_size, 1, infile) != 1) {
++                fread(ftyp_atom, atom_size, 1, infile) != 1 ||
++                (start_offset = ftello(infile))<0) {
                  perror(argv[1]);
                  goto error_out;
              }