RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 12:27:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51'

Browse Source 
* commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51':
  proresenc: Properly account for alpha plane

Conflicts:
	libavcodec/proresenc_kostya.c

See: 117bc8e6ff
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-18 20:27:41 +02:00
commit cdd0ad7be1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/proresenc_kostya.c
View File

@ -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 *