From cf85a20d920fb3c43f81c4b49f0bc6723ab811d9 Mon Sep 17 00:00:00 2001
From: Mats Peterson <matsp888@yahoo.com>
Date: Sun, 21 Feb 2016 06:50:41 +0100
Subject: [PATCH] lavc/rawdec: Align AV_PIX_FMT_RGB24 correctly
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavcodec/rawdec.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index eb9fe48b5f6..765e567d1fa 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -384,11 +384,12 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
}
}
- if ((avctx->pix_fmt==AV_PIX_FMT_BGR24 ||
- avctx->pix_fmt==AV_PIX_FMT_GRAY8 ||
- avctx->pix_fmt==AV_PIX_FMT_RGB555LE ||
- avctx->pix_fmt==AV_PIX_FMT_RGB555BE ||
- avctx->pix_fmt==AV_PIX_FMT_RGB565LE ||
+ if ((avctx->pix_fmt==AV_PIX_FMT_RGB24 ||
+ avctx->pix_fmt==AV_PIX_FMT_BGR24 ||
+ avctx->pix_fmt==AV_PIX_FMT_GRAY8 ||
+ avctx->pix_fmt==AV_PIX_FMT_RGB555LE ||
+ avctx->pix_fmt==AV_PIX_FMT_RGB555BE ||
+ avctx->pix_fmt==AV_PIX_FMT_RGB565LE ||
avctx->pix_fmt==AV_PIX_FMT_MONOWHITE ||
avctx->pix_fmt==AV_PIX_FMT_MONOBLACK ||
avctx->pix_fmt==AV_PIX_FMT_PAL8) &&
--
GitLab