diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index 6caa7521f7..8b398d2dc9 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -152,6 +152,8 @@ static int raw_decode(AVCodecContext *avctx,
         memcpy(frame->data[1], avctx->palctrl->palette, AVPALETTE_SIZE);
         avctx->palctrl->palette_changed = 0;
     }
+    if(avctx->pix_fmt==PIX_FMT_BGR24 && ((frame->linesize[0]+3)&~3)*avctx->height <= buf_size)
+        frame->linesize[0] = (frame->linesize[0]+3)&~3;
 
     if(context->flip)
         flip(avctx, picture);