summaryrefslogtreecommitdiff
path: root/libavcodec/ffv1enc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-20 02:10:04 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-20 02:11:48 +0200
commit749f85496ccff345ec811976ce45ec9e1900e9a8 (patch)
treebea78d43a6a941ce0766b6607e6de729de5fcae2 /libavcodec/ffv1enc.c
parentc239fcb94893db484a6a1ef6c7b915cf54c03a9f (diff)
downloadffmpeg-749f85496ccff345ec811976ce45ec9e1900e9a8.tar.gz
avcodec/ffv1enc: fix assertion failure with unset bits per raw sample
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/ffv1enc.c')
-rw-r--r--libavcodec/ffv1enc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 45ab3a39a3..a47a64d391 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -755,6 +755,8 @@ static av_cold int encode_init(AVCodecContext *avctx)
s->transparency = desc->nb_components == 4;
if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample)
s->bits_per_raw_sample = 8;
+ else if (!s->bits_per_raw_sample)
+ s->bits_per_raw_sample = 8;
break;
case AV_PIX_FMT_RGB32:
s->colorspace = 1;