diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-18 00:34:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-18 22:09:01 +0200 |
| commit | 08fadda68aebdc0b28c6e2816b77875ee50d6faf (patch) | |
| tree | 8ed0b9788ab391832159d26290155516aec98978 /libavcodec/ffv1enc.c | |
| parent | 9473e5a05d2cbdd56a7e3923868451a07a0edfe0 (diff) | |
| download | ffmpeg-08fadda68aebdc0b28c6e2816b77875ee50d6faf.tar.gz | |
avcodec/ffv1enc: fix bps for >8bit yuv when not explicitly set
Fixes Ticket4636
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3a6a8f6ee1cb619913b87b6c78e0436303e2a35f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1enc.c')
| -rw-r--r-- | libavcodec/ffv1enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index af727a5cd5..45ab3a39a3 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -753,7 +753,7 @@ static av_cold int encode_init(AVCodecContext *avctx) s->chroma_planes = desc->nb_components < 3 ? 0 : 1; s->colorspace = 0; s->transparency = desc->nb_components == 4; - if (!avctx->bits_per_raw_sample) + if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) s->bits_per_raw_sample = 8; break; case AV_PIX_FMT_RGB32: |