From 3713cf11c62df4d993272843c7ef57a1dca3a386 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 30 Jun 2011 09:02:14 +0200 Subject: [PATCH] Fix linesize for some rawvideo samples with odd width. --- libavcodec/rawdec.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 04aa51edc2..6644d6c7e4 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -192,7 +192,13 @@ static int raw_decode(AVCodecContext *avctx, frame->palette_has_changed = 1; } } - if(avctx->pix_fmt==PIX_FMT_BGR24 && ((frame->linesize[0]+3)&~3)*avctx->height <= buf_size) + if((avctx->pix_fmt==PIX_FMT_BGR24 || + avctx->pix_fmt==PIX_FMT_GRAY8 || + avctx->pix_fmt==PIX_FMT_RGB555LE || + avctx->pix_fmt==PIX_FMT_RGB555BE || + avctx->pix_fmt==PIX_FMT_RGB565LE || + avctx->pix_fmt==PIX_FMT_PAL8) && + ((frame->linesize[0]+3)&~3)*avctx->height <= buf_size) frame->linesize[0] = (frame->linesize[0]+3)&~3; if(context->flip)