aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-18 16:07:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-18 16:07:54 +0100
commit9bb1af8f36ec666280d5cd3a2d2261abe4187940 (patch)
tree5d78fdf6a827317fe7c57146c746675cf436a167
parent1355cafcb675e773713bce8606001bc67a2b2cb5 (diff)
downloadffmpeg-9bb1af8f36ec666280d5cd3a2d2261abe4187940.tar.gz
avcodec/huffyuvdec: use RGB0 for 24bit rgb output instead of BGRA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/huffyuvdec.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index 0f6f22350f..811347a134 100644
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -361,14 +361,17 @@ static av_cold int decode_init(AVCodecContext *avctx)
s->yuv = 1;
break;
case 24:
- case 32:
if (s->bgr32) {
- avctx->pix_fmt = AV_PIX_FMT_RGB32;
- s->alpha = 1;
+ avctx->pix_fmt = AV_PIX_FMT_0RGB32;
} else {
avctx->pix_fmt = AV_PIX_FMT_BGR24;
}
break;
+ case 32:
+ av_assert0(s->bgr32);
+ avctx->pix_fmt = AV_PIX_FMT_RGB32;
+ s->alpha = 1;
+ break;
default:
return AVERROR_INVALIDDATA;
}