ptrdiff_t is the correct type for array strides and similar.
}
}
-static void cmv_motcomp(unsigned char *dst, int dst_stride,
- const unsigned char *src, int src_stride,
+static void cmv_motcomp(unsigned char *dst, ptrdiff_t dst_stride,
+ const unsigned char *src, ptrdiff_t src_stride,
int x, int y,
int xoffset, int yoffset,
int width, int height){
IDCT_COL(dest, src);
}
-void ff_ea_idct_put_c(uint8_t *dest, int linesize, int16_t *block) {
+void ff_ea_idct_put_c(uint8_t *dest, ptrdiff_t linesize, int16_t *block)
+{
int i;
int16_t temp[64];
block[0] += 4;
#ifndef AVCODEC_EAIDCT_H
#define AVCODEC_EAIDCT_H
+#include <stddef.h>
#include <stdint.h>
-void ff_ea_idct_put_c(uint8_t *dest, int linesize, int16_t *block);
+void ff_ea_idct_put_c(uint8_t *dest, ptrdiff_t linesize, int16_t *block);
#endif /* AVCODEC_EAIDCT_H */
return 0;
}
-static inline void comp(unsigned char *dst, int dst_stride,
- unsigned char *src, int src_stride, int add)
+static inline void comp(unsigned char *dst, ptrdiff_t dst_stride,
+ unsigned char *src, ptrdiff_t src_stride, int add)
{
int j, i;
for (j=0; j<8; j++)
static void tgq_idct_put_mb(TgqContext *s, int16_t (*block)[64], AVFrame *frame,
int mb_x, int mb_y)
{
- int linesize = frame->linesize[0];
+ ptrdiff_t linesize = frame->linesize[0];
uint8_t *dest_y = frame->data[0] + (mb_y * 16 * linesize) + mb_x * 16;
uint8_t *dest_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8;
uint8_t *dest_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8;
}
static inline void tgq_dconly(TgqContext *s, unsigned char *dst,
- int dst_stride, int dc)
+ ptrdiff_t dst_stride, int dc)
{
int level = av_clip_uint8((dc*s->qtable[0] + 2056) >> 4);
int j;
static void tgq_idct_put_mb_dconly(TgqContext *s, AVFrame *frame,
int mb_x, int mb_y, const int8_t *dc)
{
- int linesize = frame->linesize[0];
+ ptrdiff_t linesize = frame->linesize[0];
uint8_t *dest_y = frame->data[0] + (mb_y * 16 * linesize) + mb_x * 16;
uint8_t *dest_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8;
uint8_t *dest_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8;
for (x = 0; x < s->avctx->width / 4; x++) {
unsigned int vector = get_bits(&gb, vector_bits);
const uint8_t *src;
- int src_stride;
+ ptrdiff_t src_stride;
if (vector < num_mvs) {
int mx = x * 4 + s->mv_codebook[vector][0];
int16_t (*block)[64])
{
TqiContext *t = avctx->priv_data;
- int linesize = frame->linesize[0];
+ ptrdiff_t linesize = frame->linesize[0];
uint8_t *dest_y = frame->data[0] + t->mb_y * 16 * linesize + t->mb_x * 16;
uint8_t *dest_cb = frame->data[1] + t->mb_y * 8 * frame->linesize[1] + t->mb_x * 8;
uint8_t *dest_cr = frame->data[2] + t->mb_y * 8 * frame->linesize[2] + t->mb_x * 8;