From: Michael Niedermayer <[email protected]>
qt-faststart doesn't use the normal libav headers at all since
it's supposed to be a completely standalone tool, so we implement
the macro locally in this file.
---
Changed the macro from FFMIN to MIN.
---
tools/qt-faststart.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c
index 88f5b48..69818be 100644
--- a/tools/qt-faststart.c
+++ b/tools/qt-faststart.c
@@ -37,6 +37,8 @@
#define ftello(x) _ftelli64(x)
#endif
+#define MIN(a,b) ((a) > (b) ? (b) : (a))
+
#define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
#define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \
@@ -295,10 +297,7 @@ int main(int argc, char *argv[])
/* copy the remainder of the infile, from offset 0 -> last_offset - 1 */
printf(" copying rest of file...\n");
while (last_offset) {
- if (last_offset > COPY_BUFFER_SIZE)
- bytes_to_copy = COPY_BUFFER_SIZE;
- else
- bytes_to_copy = last_offset;
+ bytes_to_copy = MIN(COPY_BUFFER_SIZE, last_offset);
if (fread(copy_buffer, bytes_to_copy, 1, infile) != 1) {
perror(argv[1]);
--
1.8.3.4 (Apple Git-47)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
