diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 21:35:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 21:46:29 +0100 |
| commit | 41915d0b86c60a46c1dc8151672770b7cddbe18f (patch) | |
| tree | 411414ef0997500cea54ae4406b5bd2e4496664f /libavcodec/proresenc_kostya.c | |
| parent | 71df932b22377e9eb5e319e30ff5eb0cc87a3e3e (diff) | |
| parent | 4690e01c3aaf495c87127e5dc74aa347197dbc0b (diff) | |
| download | ffmpeg-41915d0b86c60a46c1dc8151672770b7cddbe18f.tar.gz | |
Merge commit '4690e01c3aaf495c87127e5dc74aa347197dbc0b'
* commit '4690e01c3aaf495c87127e5dc74aa347197dbc0b':
prores: Evaluate all the quantizers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresenc_kostya.c')
| -rw-r--r-- | libavcodec/proresenc_kostya.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 5f432a97cd..3418b464c6 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -824,10 +824,9 @@ static int find_slice_quant(AVCodecContext *avctx, const AVFrame *pic, if (ctx->alpha_bits) bits += estimate_alpha_plane(ctx, &error, src, linesize[3], mbs_per_slice, q, td->blocks[3]); - if (bits > 65000 * 8) { + if (bits > 65000 * 8) error = SCORE_LIMIT; - break; - } + slice_bits[q] = bits; slice_score[q] = error; } |