[FFmpeg-cvslog] prores: Evaluate all the quantizers

[Luca Barbato]

ffmpeg | branch: release/2.4 | Luca Barbato <lu_zero at gentoo.org> | Wed Dec 10 01:43:50 2014 +0100| [23fe589e19487bc9a40b77dae9509068da5b14b8] | committer: Luca Barbato

prores: Evaluate all the quantizers

Prevent an uninitialized data access.

CC: libav-stable at libav.org
Bug-Id: CID 703824 / CID 703825
Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23fe589e19487bc9a40b77dae9509068da5b14b8
---

 libavcodec/proresenc.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c
index 3a82c2c..f61aa60 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;
     }