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

[frescor/ffmpeg.git] / libavcodec / vp3.c

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 43a3658c3383cce875a63b3d4d543e5c126a2d73..9f7dfb62d7dfc6a22e4d3aed1c91c20308e9abff 100644 (file)
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -1636,8 +1636,8 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx)
         s->version = 1;
 
     s->avctx = avctx;
-    s->width = (avctx->width + 15) & 0xFFFFFFF0;
-    s->height = (avctx->height + 15) & 0xFFFFFFF0;
+    s->width = FFALIGN(avctx->width, 16);
+    s->height = FFALIGN(avctx->height, 16);
     avctx->pix_fmt = PIX_FMT_YUV420P;
     avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
     if(avctx->idct_algo==FF_IDCT_AUTO)