virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

dsputil: convert remaining op_pixels_func

Browse Source 
Convert to diffptr_t the line_size parameters still int.

Remove all the warnings in dsputil.c
This commit is contained in:
Luca Barbato 2013-02-10 00:17:20 +01:00
parent 488f87be87
commit 0b70fb1d51
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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);\
} }

2
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;\

6
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 ));\