summaryrefslogtreecommitdiff
path: root/libavcodec/ffv1enc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-18 00:34:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-18 01:01:06 +0200
commit3a6a8f6ee1cb619913b87b6c78e0436303e2a35f (patch)
tree6254176aa8d87db401b54ab51f0bd524da9e6753 /libavcodec/ffv1enc.c
parent47cadf4d1fa0f24295c38cd14bb939c2cfd7ab87 (diff)
avcodec/ffv1enc: fix bps for >8bit yuv when not explicitly set
Fixes Ticket4636 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1enc.c')
-rw-r--r--libavcodec/ffv1enc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index af727a5cd5..45ab3a39a3 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -753,7 +753,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
s->chroma_planes = desc->nb_components < 3 ? 0 : 1;
s->colorspace = 0;
s->transparency = desc->nb_components == 4;
- if (!avctx->bits_per_raw_sample)
+ if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample)
s->bits_per_raw_sample = 8;
break;
case AV_PIX_FMT_RGB32: