aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-02-22 20:48:38 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-21 01:52:51 +0100
commit9783f9fb98a77eebde7a6ee9284bbff2a3e10df5 (patch)
treee60bcee75e2427489d9b54ab5469603c6c5b209a
parent2ed0a77b7beceae1b75a1e02a81b6241c048e166 (diff)
downloadffmpeg-9783f9fb98a77eebde7a6ee9284bbff2a3e10df5.tar.gz
avcodec/a64multienc: fix use of uninitialized values in to_meta_with_crop
Averaging over 2 pixels doesn't work correctly for the last pixel, because the rest of the buffer is not initialized. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 87513d654546a99f8ddb045ca4fa5d33778a617e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/a64multienc.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c
index 9f3bc0d64d..d54b37e222 100644
--- a/libavcodec/a64multienc.c
+++ b/libavcodec/a64multienc.c
@@ -78,9 +78,13 @@ static void to_meta_with_crop(AVCodecContext *avctx, AVFrame *p, int *dest)
for (y = blocky; y < blocky + 8 && y < C64YRES; y++) {
for (x = blockx; x < blockx + 8 && x < C64XRES; x += 2) {
if(x < width && y < height) {
- /* build average over 2 pixels */
- luma = (src[(x + 0 + y * p->linesize[0])] +
- src[(x + 1 + y * p->linesize[0])]) / 2;
+ if (x + 1 < width) {
+ /* build average over 2 pixels */
+ luma = (src[(x + 0 + y * p->linesize[0])] +
+ src[(x + 1 + y * p->linesize[0])]) / 2;
+ } else {
+ luma = src[(x + y * p->linesize[0])];
+ }
/* write blocks as linear data now so they are suitable for elbg */
dest[0] = luma;
}