diff options
| author | Roman Shaposhnik <roman@shaposhnik.org> | 2003-10-16 18:27:48 +0000 |
|---|---|---|
| committer | Roman Shaposhnik <roman@shaposhnik.org> | 2003-10-16 18:27:48 +0000 |
| commit | 5c00fe413732331369f9028831457aae3a66f587 (patch) | |
| tree | 7345792c16fbbc8d22367e2c77fc6b9e5ee4bc8e /libavcodec/utils.c | |
| parent | 00c28046e48b2892da9abf3764458308a170aaac (diff) | |
* original fix still didn't align lines on s_align when CODEC_FLAG_EMU_EDGE
was not set.
Originally committed as revision 2394 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0f0bf90729..ac4a12fb16 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -240,7 +240,7 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){ if(s->flags&CODEC_FLAG_EMU_EDGE) buf->data[i] = buf->base[i]; else - buf->data[i] = buf->base[i] + (pic->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift); + buf->data[i] = buf->base[i] + ALIGN((pic->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), s_align); } pic->age= 256*256*256*64; pic->type= FF_BUFFER_TYPE_INTERNAL; |