Browse Source

dsputil: convert remaining op_pixels_func

Convert to diffptr_t the line_size parameters still int.

Remove all the warnings in dsputil.c
tags/n1.2
Luca Barbato 12 years ago
parent
commit
0b70fb1d51
3 changed files with 5 additions and 5 deletions
  1. +1
    -1
      libavcodec/dsputil.h
  2. +1
    -1
      libavcodec/dsputil_template.c
  3. +3
    -3
      libavcodec/hpel_template.c

+ 1
- 1
libavcodec/dsputil.h View File

@@ -114,7 +114,7 @@ DEF_OLD_QPEL(qpel8_mc13_old_c)
DEF_OLD_QPEL(qpel8_mc33_old_c) DEF_OLD_QPEL(qpel8_mc33_old_c)


#define CALL_2X_PIXELS(a, b, n)\ #define CALL_2X_PIXELS(a, b, n)\
static void a(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
static void a(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
b(block , pixels , line_size, h);\ b(block , pixels , line_size, h);\
b(block+n, pixels+n, line_size, h);\ b(block+n, pixels+n, line_size, h);\
} }


+ 1
- 1
libavcodec/dsputil_template.c View File

@@ -361,7 +361,7 @@ static inline void FUNCC(OPNAME ## _pixels4_xy2)(uint8_t *block, const uint8_t *
}\ }\
}\ }\
\ \
static inline void FUNCC(OPNAME ## _pixels8_xy2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)\
static inline void FUNCC(OPNAME ## _pixels8_xy2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)\
{\ {\
/* FIXME HIGH BIT DEPTH */\ /* FIXME HIGH BIT DEPTH */\
int j;\ int j;\


+ 3
- 3
libavcodec/hpel_template.c View File

@@ -20,7 +20,7 @@
*/ */


#define DEF_HPEL(OPNAME, OP) \ #define DEF_HPEL(OPNAME, OP) \
static inline void FUNCC(OPNAME ## _pixels2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
static inline void FUNCC(OPNAME ## _pixels2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
int i;\ int i;\
for(i=0; i<h; i++){\ for(i=0; i<h; i++){\
OP(*((pixel2*)(block )), AV_RN2P(pixels ));\ OP(*((pixel2*)(block )), AV_RN2P(pixels ));\
@@ -28,7 +28,7 @@ static inline void FUNCC(OPNAME ## _pixels2)(uint8_t *block, const uint8_t *pixe
block +=line_size;\ block +=line_size;\
}\ }\
}\ }\
static inline void FUNCC(OPNAME ## _pixels4)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
static inline void FUNCC(OPNAME ## _pixels4)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
int i;\ int i;\
for(i=0; i<h; i++){\ for(i=0; i<h; i++){\
OP(*((pixel4*)(block )), AV_RN4P(pixels ));\ OP(*((pixel4*)(block )), AV_RN4P(pixels ));\
@@ -36,7 +36,7 @@ static inline void FUNCC(OPNAME ## _pixels4)(uint8_t *block, const uint8_t *pixe
block +=line_size;\ block +=line_size;\
}\ }\
}\ }\
static inline void FUNCC(OPNAME ## _pixels8)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
static inline void FUNCC(OPNAME ## _pixels8)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
int i;\ int i;\
for(i=0; i<h; i++){\ for(i=0; i<h; i++){\
OP(*((pixel4*)(block )), AV_RN4P(pixels ));\ OP(*((pixel4*)(block )), AV_RN4P(pixels ));\


Loading…
Cancel
Save