aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-18 20:27:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-18 20:27:41 +0200
commitcdd0ad7be1f94c4c44219d8afecb6a3e1c23041b (patch)
treec53f1281f5c458ec35870543a5fbeac9823299f5
parente348a81a66851e35b9f6facf70c678e886bd3805 (diff)
parent41e1354c101004ccd46dc08d3dd6e956e83a6b51 (diff)
downloadffmpeg-cdd0ad7be1f94c4c44219d8afecb6a3e1c23041b.tar.gz
Merge commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51'
* commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51': proresenc: Properly account for alpha plane Conflicts: libavcodec/proresenc_kostya.c See: 117bc8e6ffc744fedcf77edf2fdb33c964b83370 Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/proresenc_kostya.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c
index 90f08351a3..0f69767a07 100644
--- a/libavcodec/proresenc_kostya.c
+++ b/libavcodec/proresenc_kostya.c
@@ -1253,7 +1253,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
+ 200;
if (ctx->alpha_bits) {
- // alpha plane is run-coded and might run over bit budget
+ // The alpha plane is run-coded and might exceed the bit budget.
ctx->frame_size_upper_bound += ctx->pictures_per_frame *
ctx->slices_per_picture *
/* num pixels per slice */ (ctx->mbs_per_slice * 256 *