diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 00:33:27 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-06-11 09:49:56 +0200 |
| commit | 376a9f8e6e362178c4e9d95c7d18e1775c014eb6 (patch) | |
| tree | 9b693ed7ed9e6dd7c3768cc0ce4d7b7b3e6f33a2 | |
| parent | 9af68f8d1f3df12a32574e003e065bc565695b52 (diff) | |
| download | ffmpeg-376a9f8e6e362178c4e9d95c7d18e1775c014eb6.tar.gz | |
avcodec/utils: Fix encoder allocation size
Fixes Ticket2645
Found-by: Darrell Walisser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 175e916fa20b7887bdb29809817985e481ae0888)
Conflicts:
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 8a4aaf486f..2fd61e627c 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -474,7 +474,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) buf->linesize[i] = picture.linesize[i]; - buf->base[i] = av_malloc(size[i] + 16); //FIXME 16 + buf->base[i] = av_malloc(size[i] + 16 + STRIDE_ALIGN - 1); //FIXME 16 if (buf->base[i] == NULL) return AVERROR(ENOMEM); |