From 3462da0b5c8ff8dc4984769bf67aef6afd871cb1 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 1 Mar 2007 12:54:38 +0000 Subject: [PATCH] Replace MIN with FFMIN git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22396 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/asf.h | 4 ---- spudec.c | 8 +++----- stream/asf_streaming.c | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h index 3a6d1bc725..028f1bba1a 100644 --- a/libmpdemux/asf.h +++ b/libmpdemux/asf.h @@ -6,10 +6,6 @@ #include "libavutil/common.h" #include "mpbswap.h" -#ifndef MIN -#define MIN(a,b) (((a)<(b))?(a):(b)) -#endif - /////////////////////// // MS GUID definition /////////////////////// diff --git a/spudec.c b/spudec.c index ebaba6bd5f..451269a2e3 100644 --- a/spudec.c +++ b/spudec.c @@ -30,8 +30,6 @@ #endif #include "libswscale/swscale.h" -#define MIN(a, b) ((a)<(b)?(a):(b)) - /* Valid values for spu_aamode: 0: none (fastest, most ugly) 1: approximate @@ -706,7 +704,7 @@ static void scale_table(unsigned int start_src, unsigned int start_tar, unsigned } src_step = (delta_src << 16) / delta_tar >>1; for (t = 0; t<=delta_tar; src += (src_step << 1), t++){ - table[t].position= MIN(src >> 16, end_src - 1); + table[t].position= FFMIN(src >> 16, end_src - 1); table[t].right_down = src & 0xffff; table[t].left_up = 0x10000 - table[t].right_down; } @@ -936,7 +934,7 @@ void spudec_draw_scaled(void *me, unsigned int dxs, unsigned int dys, void (*dra for (y = 0; y < spu->scaled_height; ++y) { const double unscaled_y = y * inv_scaley; const double unscaled_y_bottom = unscaled_y + inv_scaley; - const unsigned int top_low_row = MIN(unscaled_y_bottom, unscaled_y + 1.0); + const unsigned int top_low_row = FFMIN(unscaled_y_bottom, unscaled_y + 1.0); const double top = top_low_row - unscaled_y; const unsigned int height = unscaled_y_bottom > top_low_row ? (unsigned int) unscaled_y_bottom - top_low_row @@ -947,7 +945,7 @@ void spudec_draw_scaled(void *me, unsigned int dxs, unsigned int dys, void (*dra for (x = 0; x < spu->scaled_width; ++x) { const double unscaled_x = x * inv_scalex; const double unscaled_x_right = unscaled_x + inv_scalex; - const unsigned int left_right_column = MIN(unscaled_x_right, unscaled_x + 1.0); + const unsigned int left_right_column = FFMIN(unscaled_x_right, unscaled_x + 1.0); const double left = left_right_column - unscaled_x; const unsigned int width = unscaled_x_right > left_right_column ? (unsigned int) unscaled_x_right - left_right_column diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c index 13ff3d57ec..7edb0d856a 100644 --- a/stream/asf_streaming.c +++ b/stream/asf_streaming.c @@ -470,7 +470,7 @@ static int asf_http_streaming_read( int fd, char *buffer, int size, streaming_ct if (drop_chunk) continue; } if (rest == 0 && waiting > 0 && size-read > 0) { - int s = MIN(waiting,size-read); + int s = FFMIN(waiting,size-read); memset(buffer+read,0,s); waiting -= s; read += s;