aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2014-12-10 01:43:50 +0100
committerLuca Barbato <lu_zero@gentoo.org>2015-01-12 23:15:19 +0100
commit23fe589e19487bc9a40b77dae9509068da5b14b8 (patch)
tree62d4c4d42b3b39af92ccd98698da6cd1b7c0c7fc
parent9bd4561d74a46dd6557140e286228e09e380674c (diff)
downloadffmpeg-23fe589e19487bc9a40b77dae9509068da5b14b8.tar.gz
prores: Evaluate all the quantizers
Prevent an uninitialized data access. CC: libav-stable@libav.org Bug-Id: CID 703824 / CID 703825 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--libavcodec/proresenc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c
index 3a82c2c893..f61aa60a20 100644
--- a/libavcodec/proresenc.c
+++ b/libavcodec/proresenc.c
@@ -820,10 +820,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;
}