diff options
| author | Paul B Mahol <onemda@gmail.com> | 2017-06-24 16:34:52 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2017-06-25 17:36:54 +0200 |
| commit | 315f51128a95ca34ac3212c86b2a938330ba6b6e (patch) | |
| tree | 4eacae8fe2755f3d5188cabd831db0a11eb67065 /libavcodec | |
| parent | 22a03c29006e9c6b41ce6e63831bd3faa69a1fe8 (diff) | |
| download | ffmpeg-315f51128a95ca34ac3212c86b2a938330ba6b6e.tar.gz | |
avcodec/prores_kostya: increase bits usage when alpha is used
Also fix undefined left shift of negative variable.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/proresenc_kostya.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 090dfa5c0a..25f7fcb9b1 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -358,7 +358,7 @@ static inline void encode_vlc_codeword(PutBitContext *pb, unsigned codebook, int } #define GET_SIGN(x) ((x) >> 31) -#define MAKE_CODE(x) (((x) << 1) ^ GET_SIGN(x)) +#define MAKE_CODE(x) ((((x)) * 2) ^ GET_SIGN(x)) static void encode_dcs(PutBitContext *pb, int16_t *blocks, int blocks_per_slice, int scale) @@ -1206,6 +1206,8 @@ FF_ENABLE_DEPRECATION_WARNINGS ctx->pictures_per_frame) break; ctx->bits_per_mb = ctx->profile_info->br_tab[i]; + if (ctx->alpha_bits) + ctx->bits_per_mb *= 20; } else if (ctx->bits_per_mb < 128) { av_log(avctx, AV_LOG_ERROR, "too few bits per MB, please set at least 128\n"); return AVERROR_INVALIDDATA; |