diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 02:59:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 03:04:37 +0200 |
| commit | 8b55f67e3ee3dabb11877aa0df2ba56d1423be43 (patch) | |
| tree | f4e2ba845f7ccaf4059ca17e0e0efd71566f75b6 | |
| parent | bb1d75e6c5e3ff0f4c4b7e53e4f9aacc25a110f4 (diff) | |
| parent | f25f5f8c62ec7728ee7f5dcc8f1abd0dc6235735 (diff) | |
| download | ffmpeg-8b55f67e3ee3dabb11877aa0df2ba56d1423be43.tar.gz | |
Merge commit 'f25f5f8c62ec7728ee7f5dcc8f1abd0dc6235735' into release/2.2
* commit 'f25f5f8c62ec7728ee7f5dcc8f1abd0dc6235735':
proresenc: Properly account for alpha plane
Conflicts:
libavcodec/proresenc_kostya.c
See: 1578986a0da41ab417ddddf5964fa192d27b759f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/proresenc_kostya.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index fb9bf4ae8f..ab56820911 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -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 * |