mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '4e7f0b082d8c4b360312216b9241bec65ff63b35'
* commit '4e7f0b082d8c4b360312216b9241bec65ff63b35': kmvc: Clip pixel position to valid range The added clip should make no difference, there are already checks for the index. Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
2adf8a9c09
|
@ -30,6 +30,7 @@
|
||||||
#include "avcodec.h"
|
#include "avcodec.h"
|
||||||
#include "bytestream.h"
|
#include "bytestream.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
#include "libavutil/common.h"
|
||||||
|
|
||||||
#define KMVC_KEYFRAME 0x80
|
#define KMVC_KEYFRAME 0x80
|
||||||
#define KMVC_PALETTE 0x40
|
#define KMVC_PALETTE 0x40
|
||||||
|
@ -55,7 +56,7 @@ typedef struct BitBuf {
|
||||||
int bitbuf;
|
int bitbuf;
|
||||||
} 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);
|
#define kmvc_init_getbits(bb, g) bb.bits = 7; bb.bitbuf = bytestream2_get_byte(g);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue