diff options
| author | Mats Peterson <matsp888@yahoo.com> | 2016-02-21 06:50:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-02-22 00:44:42 +0100 |
| commit | cf85a20d920fb3c43f81c4b49f0bc6723ab811d9 (patch) | |
| tree | d21313e60ce0c088b7e3c71ef7f09591e7bc4578 | |
| parent | 3a4232a1a0251e2ad595a544996fcc4465baf684 (diff) | |
| download | ffmpeg-cf85a20d920fb3c43f81c4b49f0bc6723ab811d9.tar.gz | |
lavc/rawdec: Align AV_PIX_FMT_RGB24 correctly
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/rawdec.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index eb9fe48b5f..765e567d1f 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) && |