Commit 743311a1 authored by Måns Rullgård's avatar Måns Rullgård
Browse files

coded line size is a multiple of 4

Originally committed as revision 6844 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2959ba80
......@@ -177,7 +177,8 @@ static int bmp_decode_frame(AVCodecContext *avctx,
buf += hsize;
dsize = buf_size - hsize;
n = avctx->width * (depth / 8);
/* Line size in file multiple of 4 */
n = (avctx->width * (depth / 8) + 3) & ~3;
if(n * avctx->height > dsize){
av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment