From e7c00a2814238d199e2ae83eb98f97f4fd8fce7a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 6 Aug 2016 01:53:30 +0200 Subject: [PATCH] avcodec/ffv1enc: Fix assertion failure with non zero bits per sample Fixes Ticket5736 Signed-off-by: Michael Niedermayer (cherry picked from commit c1bfeda5a34631787e07702f7a3569a41751caeb) Signed-off-by: Michael Niedermayer --- libavcodec/ffv1enc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 9ee992144b..42e59a1efc 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -780,14 +780,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)