diff options
author | David Conrad <lessen42@gmail.com> | 2009-05-22 21:32:13 +0000 |
---|---|---|
committer | David Conrad <lessen42@gmail.com> | 2009-05-22 21:32:13 +0000 |
commit | ef516f73778aee928826e7158ad0506d26ed9ab0 (patch) | |
tree | c9fe31f00a0f6cd08c0c5e4025b522b881be8ce8 /libavcodec/svq1dec.c | |
parent | 4969cc0bd84e5f69355f6428cddee22ba61ff897 (diff) | |
download | ffmpeg-ef516f73778aee928826e7158ad0506d26ed9ab0.tar.gz |
Move ALIGN macro to libavutil/common.h and use it in various places
Originally committed as revision 18898 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/svq1dec.c')
-rw-r--r-- | libavcodec/svq1dec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index f31b69f2a1..3d7749d4e4 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -696,13 +696,13 @@ static int svq1_decode_frame(AVCodecContext *avctx, for (i=0; i < 3; i++) { int linesize; if (i == 0) { - width = (s->width+15)&~15; - height = (s->height+15)&~15; + width = FFALIGN(s->width, 16); + height = FFALIGN(s->height, 16); linesize= s->linesize; } else { if(s->flags&CODEC_FLAG_GRAY) break; - width = (s->width/4+15)&~15; - height = (s->height/4+15)&~15; + width = FFALIGN(s->width/4, 16); + height = FFALIGN(s->height/4, 16); linesize= s->uvlinesize; } |