avcodec/ffv1enc: Fix assertion failure with non zero bits per sample

Fixes Ticket5736 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/ffv1enc: Fix assertion failure with non zero bits per sample
Fixes Ticket5736 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
c1bfeda5 · Michael Niedermayer · 82e53b3c · c1bfeda5
Commit c1bfeda5 authored Aug 05, 2016 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

ffv1enc.c libavcodec/ffv1enc.c +2 -4

No files found.
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -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)