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 /libavfilter | |
| 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 'libavfilter')
| -rw-r--r-- | libavfilter/defaults.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index 9d2064410e..7c20a08f35 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -29,10 +29,6 @@ void avfilter_default_free_video_buffer(AVFilterPic *pic) av_free(pic); } -#define ALIGN(a) do{ \ - (a) = ((a) + 15) & (~15); \ - } while(0); - /* TODO: set the buffer's priv member to a context structure for the whole * filter chain. This will allow for a buffer pool instead of the constant * alloc & free cycle currently implemented. */ @@ -56,7 +52,7 @@ AVFilterPicRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms) ff_fill_linesize((AVPicture *)pic, pic->format, ref->w); for (i=0; i<4;i++) - ALIGN(pic->linesize[i]); + pic->linesize[i] = FFALIGN(pic->linesize[i], 16); tempsize = ff_fill_pointer((AVPicture *)pic, NULL, pic->format, ref->h); buf = av_malloc(tempsize); |