OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
490a3eb
)
prores: Evaluate all the quantizers
author
Luca Barbato
<lu_zero@gentoo.org>
Wed, 10 Dec 2014 00:43:50 +0000
(
01:43
+0100)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Mon, 15 Dec 2014 14:46:34 +0000
(15:46 +0100)
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>
libavcodec/proresenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/proresenc.c
b/libavcodec/proresenc.c
index
3a82c2c
..
f61aa60
100644
(file)
--- 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;
}