generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '63848854256a024a19435e87d6bc76fffa65e81e'

Browse Source 
* commit '63848854256a024a19435e87d6bc76fffa65e81e':
  qt-faststart: Check the ftello() return codes

Conflicts:
	tools/qt-faststart.c

See: 4a2297294fa269e05aa2b3fe36b2ea231caa6dca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-01 14:19:04 +01:00
commit 77c235206a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/qt-faststart.c
View File

@ -139,7 +139,7 @@ int main(int argc, char *argv[])
} }
if (fseeko(infile, -ATOM_PREAMBLE_SIZE, SEEK_CUR) || 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) { (start_offset = ftello(infile)) < 0) {
perror(argv[1]); perror(argv[1]);
goto error_out; goto error_out;
} }
@ -203,6 +203,10 @@ int main(int argc, char *argv[])
goto error_out; goto error_out;
} }
last_offset = ftello(infile); last_offset = ftello(infile);
if (last_offset < 0) {
perror(argv[1]);
goto error_out;
}
moov_atom_size = atom_size; moov_atom_size = atom_size;
moov_atom = malloc(moov_atom_size); moov_atom = malloc(moov_atom_size);
if (!moov_atom) { if (!moov_atom) {