From 5c00fe413732331369f9028831457aae3a66f587 Mon Sep 17 00:00:00 2001
From: Roman Shaposhnik <roman@shaposhnik.org>
Date: Thu, 16 Oct 2003 18:27:48 +0000
Subject: [PATCH] * 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
---
libavcodec/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 0f0bf907295..ac4a12fb161 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;
--
GitLab