Mercurial > libavcodec.hg
comparison svq1dec.c @ 9686:bc32976d6d9d libavcodec
Move ALIGN macro to libavutil/common.h and use it in various places
author | conrad |
---|---|
date | Fri, 22 May 2009 21:32:13 +0000 |
parents | 5921cf626a4a |
children | 38cfe222e1a4 |
comparison
equal
deleted
inserted
replaced
9685:ab8b3b2e4d49 | 9686:bc32976d6d9d |
---|---|
694 | 694 |
695 /* decode y, u and v components */ | 695 /* decode y, u and v components */ |
696 for (i=0; i < 3; i++) { | 696 for (i=0; i < 3; i++) { |
697 int linesize; | 697 int linesize; |
698 if (i == 0) { | 698 if (i == 0) { |
699 width = (s->width+15)&~15; | 699 width = FFALIGN(s->width, 16); |
700 height = (s->height+15)&~15; | 700 height = FFALIGN(s->height, 16); |
701 linesize= s->linesize; | 701 linesize= s->linesize; |
702 } else { | 702 } else { |
703 if(s->flags&CODEC_FLAG_GRAY) break; | 703 if(s->flags&CODEC_FLAG_GRAY) break; |
704 width = (s->width/4+15)&~15; | 704 width = FFALIGN(s->width/4, 16); |
705 height = (s->height/4+15)&~15; | 705 height = FFALIGN(s->height/4, 16); |
706 linesize= s->uvlinesize; | 706 linesize= s->uvlinesize; |
707 } | 707 } |
708 | 708 |
709 current = s->current_picture.data[i]; | 709 current = s->current_picture.data[i]; |
710 | 710 |