From 7f2ca68a8460b1e5ab0e53fa068296a779bd116c Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 13 May 2004 14:54:57 +0000
Subject: [PATCH] segfault fix
Originally committed as revision 3135 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/img.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/img.c b/libavformat/img.c
index 25ac5119606..38338411762 100644
--- a/libavformat/img.c
+++ b/libavformat/img.c
@@ -175,7 +175,7 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
st->codec.width = s->width;
st->codec.height = s->height;
st->codec.pix_fmt = s->pix_fmt;
- s->img_size = avpicture_get_size(s->pix_fmt, s->width, s->height);
+ s->img_size = avpicture_get_size(s->pix_fmt, (s->width+15)&(~15), (s->height+15)&(~15));
return 0;
fail1:
@@ -193,7 +193,7 @@ static int read_packet_alloc_cb(void *opaque, AVImageInfo *info)
if (info->width != s->width ||
info->height != s->height)
return -1;
- avpicture_fill(&info->pict, s->ptr, info->pix_fmt, info->width, info->height);
+ avpicture_fill(&info->pict, s->ptr, info->pix_fmt, (info->width+15)&(~15), (info->height+15)&(~15));
return 0;
}
--
GitLab