mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-11 01:47:55 +02:00
Merge commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475'
* commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475':
qt-faststart: Check fseeko() return codes
Conflicts:
tools/qt-faststart.c
See: 0de41ead6f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
11c4bc9a74
@ -137,9 +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 ||
|
||||
(start_offset = ftello(infile))<0) {
|
||||
perror(argv[1]);
|
||||
goto error_out;
|
||||
}
|
||||
@ -155,7 +155,7 @@ int main(int argc, char *argv[])
|
||||
} else {
|
||||
ret = fseeko(infile, atom_size - ATOM_PREAMBLE_SIZE, SEEK_CUR);
|
||||
}
|
||||
if(ret) {
|
||||
if (ret) {
|
||||
perror(argv[1]);
|
||||
goto error_out;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user