Module: libav Branch: release/0.8 Commit: 79edb9adf619d944f800f1e0eda03b0b7edef67f
Author: Luca Barbato <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Mon Jul 1 03:05:41 2013 +0200 kmvc: Clip pixel position to valid range Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] (cherry picked from commit 4e7f0b082d8c4b360312216b9241bec65ff63b35) Signed-off-by: Reinhard Tartler <[email protected]> Conflicts: libavcodec/kmvc.c --- libavcodec/kmvc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c index fca0c72..4ed7811 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -29,6 +29,8 @@ #include "avcodec.h" #include "bytestream.h" +#include "internal.h" +#include "libavutil/common.h" #define KMVC_KEYFRAME 0x80 #define KMVC_PALETTE 0x40 @@ -55,7 +57,7 @@ typedef struct BitBuf { int bitbuf; } BitBuf; -#define BLK(data, x, y) data[(x) + (y) * 320] +#define BLK(data, x, y) data[av_clip((x) + (y) * 320, 0, 320 * 200 -1)] #define kmvc_init_getbits(bb, g) bb.bits = 7; bb.bitbuf = bytestream2_get_byte(g); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
