eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f25f5f8c62ec7728ee7f5dcc8f1abd0dc6235735' into release/2.2

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

Conflicts:
	libavcodec/proresenc_kostya.c

See: 1578986a0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-23 02:59:22 +02:00
parent bb1d75e6c5 f25f5f8c62
commit 8b55f67e3e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/proresenc_kostya.c
+1 -1
View File
@@ -1254,7 +1254,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 *