diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-23 22:04:28 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-23 22:04:37 +0200 |
commit | 8d31b22869f6a676fe4d1e34d74c0fa3b081421c (patch) | |
tree | 64f1d91ebd8974a383a66d17cefd9c6a77465d13 /libavcodec/proresenc_kostya.c | |
parent | 400810abee8fdf1a58ea852065b08e8ce1ca70c4 (diff) | |
parent | 0a51c7d42a519c63178a4f3e35b8967f21da3a6a (diff) | |
download | ffmpeg-8d31b22869f6a676fe4d1e34d74c0fa3b081421c.tar.gz |
Merge commit '0a51c7d42a519c63178a4f3e35b8967f21da3a6a'
* commit '0a51c7d42a519c63178a4f3e35b8967f21da3a6a':
prores: Set the bits_per_coded_sample for alpha pix_fmt
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresenc_kostya.c')
-rw-r--r-- | libavcodec/proresenc_kostya.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index a2a8d73c0b..18413681f6 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -1163,6 +1163,7 @@ static av_cold int encode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "alpha bits should be 0, 8 or 16\n"); return AVERROR(EINVAL); } + avctx->bits_per_coded_sample = 32; } else { ctx->alpha_bits = 0; } |