[FFmpeg-cvslog] lavc/rawdec: Align AV_PIX_FMT_RGB24 correctly
Mats Peterson
git at videolan.org
Mon Feb 22 00:49:29 CET 2016
ffmpeg | branch: master | Mats Peterson <matsp888 at yahoo.com> | Sun Feb 21 06:50:41 2016 +0100| [cf85a20d920fb3c43f81c4b49f0bc6723ab811d9] | committer: Michael Niedermayer
lavc/rawdec: Align AV_PIX_FMT_RGB24 correctly
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf85a20d920fb3c43f81c4b49f0bc6723ab811d9
---
libavcodec/rawdec.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index eb9fe48..765e567 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) &&
More information about the ffmpeg-cvslog
mailing list