generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '23fe589e19487bc9a40b77dae9509068da5b14b8' into release/2.4

Browse Source 
* commit '23fe589e19487bc9a40b77dae9509068da5b14b8':
  prores: Evaluate all the quantizers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-17 23:55:12 +01:00
parent 0295615f0a 23fe589e19
commit 73046fa195
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/proresenc_kostya.c
View File

@@ -824,10 +824,9 @@ static int find_slice_quant(AVCodecContext *avctx, const AVFrame *pic,
if (ctx->alpha_bits) if (ctx->alpha_bits)
bits += estimate_alpha_plane(ctx, &error, src, linesize[3], bits += estimate_alpha_plane(ctx, &error, src, linesize[3],
mbs_per_slice, q, td->blocks[3]); mbs_per_slice, q, td->blocks[3]);
if (bits > 65000 * 8) { if (bits > 65000 * 8)
error = SCORE_LIMIT; error = SCORE_LIMIT;
break;
}
slice_bits[q] = bits; slice_bits[q] = bits;
slice_score[q] = error; slice_score[q] = error;
} }