diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 13:47:08 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 13:47:08 +0100 |
commit | 0bb474f686fb33ef731e34972e48b82dfbf82984 (patch) | |
tree | 865588040d395f648e3c01c5f173fac2e3240680 /tools | |
parent | eea2cd23e91ab930631d66e8ade401ece705802e (diff) | |
parent | ea15a9a5d8fa6a71af3101b2af18c4dcac07987f (diff) | |
download | ffmpeg-0bb474f686fb33ef731e34972e48b82dfbf82984.tar.gz |
Merge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f'
* commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f':
qt-faststart: Simplify code by using a MIN() macro
Conflicts:
tools/qt-faststart.c
See: 59003fe7c064e98359cce83b1b727fb1026bdf12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qt-faststart.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c index 681a51b759..ffaeac0b6c 100644 --- a/tools/qt-faststart.c +++ b/tools/qt-faststart.c @@ -37,7 +37,7 @@ #define ftello(x) _ftelli64(x) #endif -#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) +#define MIN(a,b) ((a) > (b) ? (b) : (a)) #define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) @@ -316,7 +316,7 @@ int main(int argc, char *argv[]) } /* copy the remainder of the infile, from offset 0 -> last_offset - 1 */ - bytes_to_copy = FFMIN(COPY_BUFFER_SIZE, last_offset); + bytes_to_copy = MIN(COPY_BUFFER_SIZE, last_offset); copy_buffer = malloc(bytes_to_copy); if (!copy_buffer) { printf("could not allocate %d bytes for copy_buffer\n", bytes_to_copy); @@ -324,7 +324,7 @@ int main(int argc, char *argv[]) } printf(" copying rest of file...\n"); while (last_offset) { - bytes_to_copy = FFMIN(bytes_to_copy, last_offset); + bytes_to_copy = MIN(bytes_to_copy, last_offset); if (fread(copy_buffer, bytes_to_copy, 1, infile) != 1) { perror(argv[1]); |