diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-02-10 00:17:20 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-02-17 12:03:24 +0100 |
| commit | 0b70fb1d518cbd796545fd6eef02772cd0d892c7 (patch) | |
| tree | afbe4a0647e4d050a7f7e38e63d1402aa3d6a034 /libavcodec | |
| parent | 488f87be873506abb01d67708a67c10a4dd29283 (diff) | |
| download | ffmpeg-0b70fb1d518cbd796545fd6eef02772cd0d892c7.tar.gz | |
dsputil: convert remaining op_pixels_func
Convert to diffptr_t the line_size parameters still int.
Remove all the warnings in dsputil.c
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dsputil.h | 2 | ||||
| -rw-r--r-- | libavcodec/dsputil_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/hpel_template.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index f95077f0f4..d0ba95ceeb 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -114,7 +114,7 @@ DEF_OLD_QPEL(qpel8_mc13_old_c) DEF_OLD_QPEL(qpel8_mc33_old_c) #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+n, pixels+n, line_size, h);\ } diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c index f9cecd1cc1..5244e20b84 100644 --- a/libavcodec/dsputil_template.c +++ b/libavcodec/dsputil_template.c @@ -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 */\ int j;\ diff --git a/libavcodec/hpel_template.c b/libavcodec/hpel_template.c index e3d74c5ea2..0c1f756a0c 100644 --- a/libavcodec/hpel_template.c +++ b/libavcodec/hpel_template.c @@ -20,7 +20,7 @@ */ #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;\ for(i=0; i<h; i++){\ 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;\ }\ }\ -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;\ for(i=0; i<h; i++){\ 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;\ }\ }\ -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;\ for(i=0; i<h; i++){\ OP(*((pixel4*)(block )), AV_RN4P(pixels ));\ |