diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-06 01:53:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-06 02:24:06 +0200 |
| commit | 54d48c8e901d849908ff09774d19043106f64157 (patch) | |
| tree | 26b5e391734a2c2863c7f332ef4ed532e16eaf04 | |
| parent | 43407bde3e47e0539c1cb19a708ffc3b5a03556a (diff) | |
| download | ffmpeg-54d48c8e901d849908ff09774d19043106f64157.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>
| -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 948a230419..383956bcc9 100644 --- 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) |