diff utils.c @ 9686:bc32976d6d9d libavcodec

Move ALIGN macro to libavutil/common.h and use it in various places

--- a/utils.c	Fri May 22 18:39:00 2009 +0000
+++ b/utils.c	Fri May 22 21:32:13 2009 +0000
@@ -134,8 +134,6 @@
 
 #define INTERNAL_BUFFER_SIZE 32
 
-#define ALIGN(x, a) (((x)+(a)-1)&~((a)-1))
-
 void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){
     int w_align= 1;
     int h_align= 1;
@@ -193,8 +191,8 @@
         break;
     }
 
-    *width = ALIGN(*width , w_align);
-    *height= ALIGN(*height, h_align);
+    *width = FFALIGN(*width , w_align);
+    *height= FFALIGN(*height, h_align);
     if(s->codec_id == CODEC_ID_H264)
         *height+=2; // some of the optimized chroma MC reads one line too much
 }
@@ -317,7 +315,7 @@
             if((s->flags&CODEC_FLAG_EMU_EDGE) || !size[2])
                 buf->data[i] = buf->base[i];
             else
-                buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), stride_align[i]);
+                buf->data[i] = buf->base[i] + FFALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), stride_align[i]);
         }
         if(size[1] && !size[2])
             ff_set_systematic_pal((uint32_t*)buf->data[1], s->pix_fmt);