Mercurial > mplayer.hg

changeset 22378:dc9d2940fc05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace MIN with FFMIN
author reimar
date Thu, 01 Mar 2007 12:54:38 +0000
parents fd54975f9135
children 6b245d6e56a9
files libmpdemux/asf.h spudec.c stream/asf_streaming.c
diffstat 3 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/asf.h	Thu Mar 01 12:54:08 2007 +0000
+++ b/libmpdemux/asf.h	Thu Mar 01 12:54:38 2007 +0000
@@ -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
 ///////////////////////
--- a/spudec.c	Thu Mar 01 12:54:08 2007 +0000
+++ b/spudec.c	Thu Mar 01 12:54:38 2007 +0000
@@ -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 @@
   }
   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 @@
 	    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 @@
 	      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
--- a/stream/asf_streaming.c	Thu Mar 01 12:54:08 2007 +0000
+++ b/stream/asf_streaming.c	Thu Mar 01 12:54:38 2007 +0000
@@ -470,7 +470,7 @@
       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;