1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00

qt-faststart: K&R reformatting; fix comment typos

This commit is contained in:
Diego Biurrun 2011-12-30 16:54:52 +01:00
parent ae51b1a9ba
commit cd8d84575b

View File

@ -35,10 +35,12 @@
#endif #endif
#define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) #define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
#define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \ #define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \
(((uint8_t*)(x))[1] << 16) | \ (((uint8_t*)(x))[1] << 16) | \
(((uint8_t*)(x))[2] << 8) | \ (((uint8_t*)(x))[2] << 8) | \
((uint8_t*)(x))[3]) ((uint8_t*)(x))[3])
#define BE_64(x) (((uint64_t)(((uint8_t*)(x))[0]) << 56) | \ #define BE_64(x) (((uint64_t)(((uint8_t*)(x))[0]) << 56) | \
((uint64_t)(((uint8_t*)(x))[1]) << 48) | \ ((uint64_t)(((uint8_t*)(x))[1]) << 48) | \
((uint64_t)(((uint8_t*)(x))[2]) << 40) | \ ((uint64_t)(((uint8_t*)(x))[2]) << 40) | \
@ -125,7 +127,7 @@ int main(int argc, char *argv[])
free(ftyp_atom); free(ftyp_atom);
ftyp_atom = malloc(ftyp_atom_size); ftyp_atom = malloc(ftyp_atom_size);
if (!ftyp_atom) { if (!ftyp_atom) {
printf ("could not allocate %"PRIu64" byte for ftyp atom\n", printf("could not allocate %"PRIu64" bytes for ftyp atom\n",
atom_size); atom_size);
goto error_out; goto error_out;
} }
@ -165,7 +167,7 @@ int main(int argc, char *argv[])
(atom_type != PICT_ATOM) && (atom_type != PICT_ATOM) &&
(atom_type != UUID_ATOM) && (atom_type != UUID_ATOM) &&
(atom_type != FTYP_ATOM)) { (atom_type != FTYP_ATOM)) {
printf ("encountered non-QT top-level atom (is this a Quicktime file?)\n"); printf("encountered non-QT top-level atom (is this a QuickTime file?)\n");
break; break;
} }
atom_offset += atom_size; atom_offset += atom_size;
@ -191,8 +193,7 @@ int main(int argc, char *argv[])
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) {
printf ("could not allocate %"PRIu64" byte for moov atom\n", printf("could not allocate %"PRIu64" bytes for moov atom\n", atom_size);
atom_size);
goto error_out; goto error_out;
} }
if (fread(moov_atom, atom_size, 1, infile) != 1) { if (fread(moov_atom, atom_size, 1, infile) != 1) {
@ -305,7 +306,6 @@ int main(int argc, char *argv[])
perror(argv[2]); perror(argv[2]);
goto error_out; goto error_out;
} }
last_offset -= bytes_to_copy; last_offset -= bytes_to_copy;
} }