diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-06 01:53:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-15 20:25:13 +0200 |
| commit | 3a6b27caf878c9fa5642272a8f9aecc08ae2752b (patch) | |
| tree | 1136496c09534decf3885ea8bdf6ea9190af2063 /libavcodec | |
| parent | 942c3bfbdfd17cd3778343fe7d3db3048b6e7305 (diff) | |
| download | ffmpeg-3a6b27caf878c9fa5642272a8f9aecc08ae2752b.tar.gz | |
avcodec/ffv1enc: Fix assertion failure with non zero bits per sample
Fixes Ticket5736
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c1bfeda5a34631787e07702f7a3569a41751caeb)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ffv1enc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 194bbacda1..00ef800c30 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -763,14 +763,12 @@ static av_cold int encode_init(AVCodecContext *avctx) 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) |