avcodec/ffv1enc: Fix assertion failure with non zero bits per sample
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 5 Aug 2016 23:53:30 +0000 (01:53 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 6 Aug 2016 00:22:15 +0000 (02:22 +0200)
Fixes Ticket5736
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/ffv1enc.c

index 948a230..383956b 100644 (file)
@@ -781,14 +781,12 @@ FF_ENABLE_DEPRECATION_WARNINGS
         s->colorspace = 1;
         s->transparency = 1;
         s->chroma_planes = 1;
-        if (!avctx->bits_per_raw_sample)
-            s->bits_per_raw_sample = 8;
+        s->bits_per_raw_sample = 8;
         break;
     case AV_PIX_FMT_0RGB32:
         s->colorspace = 1;
         s->chroma_planes = 1;
-        if (!avctx->bits_per_raw_sample)
-            s->bits_per_raw_sample = 8;
+        s->bits_per_raw_sample = 8;
         break;
     case AV_PIX_FMT_GBRP9:
         if (!avctx->bits_per_raw_sample)