Merge commit '0a51c7d42a519c63178a4f3e35b8967f21da3a6a'

* commit '0a51c7d42a519c63178a4f3e35b8967f21da3a6a':
  prores: Set the bits_per_coded_sample for alpha pix_fmt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/135/head
Michael Niedermayer 10 years ago
commit 8d31b22869
  1. 1
      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;
}

Loading…
Cancel
Save