From 4839fbe2d1b922b387e1a58261eeba2efe164a4e Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Mon, 28 Jan 2013 07:24:51 +0100 Subject: [PATCH 1/2] shorten: fix array subscript is below array bounds warning Incidentally fixes alpha builds. --- libavcodec/shorten.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 1dc010f441..0d022f67cc 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -469,7 +469,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, s->cur_chan = 0; while (s->cur_chan < s->channels) { - int cmd; + unsigned cmd; int len; if (get_bits_left(&s->gb) < 3+FNSIZE) { From 834e9fb0563956630e4d9bf61c9242ad134334da Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 27 Jan 2013 15:50:26 +0100 Subject: [PATCH 2/2] x86: hpeldsp: Fix a typo, use the right register MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the code actually work. Signed-off-by: Martin Storsjö --- libavcodec/x86/hpeldsp.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/x86/hpeldsp.asm b/libavcodec/x86/hpeldsp.asm index 85594c1395..ee5d56293e 100644 --- a/libavcodec/x86/hpeldsp.asm +++ b/libavcodec/x86/hpeldsp.asm @@ -452,7 +452,7 @@ cglobal avg_pixels8_xy2, 4,5 pavgb m2, [r0] pavgb m1, [r0+r2] mova [r0], m2 - mova [r0+r2], m2 + mova [r0+r2], m1 add r0, r4 sub r3d, 4 jne .loop