[SCM] libav/experimental: qt-faststart: Simplify code by using a MIN() macro

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ea15a9a5d8fa6a71af3101b2af18c4dcac07987f
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Sep 30 21:53:26 2012 +0200

    qt-faststart: Simplify code by using a MIN() macro
    
    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.
    
    Signed-off-by: Martin Storsjö <martin at martin.st>

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]);

-- 
Libav/FFmpeg packaging