summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-28 17:41:27 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-28 17:41:27 +0100
commit4b03d960220d15cb915c2c8f15970d2f36f25cd9 (patch)
treeb497d818acfa61464b7dc178740dfabeefb7f98c /libavcodec
parent2027d073ae0bb938f1756770d4d9e310d165bdd8 (diff)
ffv1dec: use PIX_FMT_0RGB32 when there is no transparency plane
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ffv1.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index ab544d5469..c3034d326c 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1609,7 +1609,8 @@ static int read_header(FFV1Context *f){
av_log(f->avctx, AV_LOG_ERROR, "chroma subsampling not supported in this colorspace\n");
return -1;
}
- f->avctx->pix_fmt= PIX_FMT_RGB32;
+ if(f->transparency) f->avctx->pix_fmt= PIX_FMT_RGB32;
+ else f->avctx->pix_fmt= PIX_FMT_0RGB32;
}else{
av_log(f->avctx, AV_LOG_ERROR, "colorspace not supported\n");
return -1;