start_x= FFMAX(0, -src_x);
end_y= FFMIN(block_h, h-src_y);
end_x= FFMIN(block_w, w-src_x);
- assert(start_y < end_y && block_h);
- assert(start_x < end_x && block_w);
+ av_assert2(start_y < end_y && block_h);
+ av_assert2(start_x < end_x && block_w);
w = end_x - start_x;
src += start_y*linesize + start_x*sizeof(pixel);
}
#define DCTELEM_FUNCS(dctcoef, suffix) \
-static void FUNCC(get_pixels ## suffix)(DCTELEM *restrict _block, \
+static void FUNCC(get_pixels ## suffix)(DCTELEM *av_restrict _block, \
const uint8_t *_pixels, \
int line_size) \
{ \
const pixel *pixels = (const pixel *) _pixels; \
- dctcoef *restrict block = (dctcoef *) _block; \
+ dctcoef *av_restrict block = (dctcoef *) _block; \
int i; \
\
/* read the pixels */ \
} \
} \
\
-static void FUNCC(add_pixels8 ## suffix)(uint8_t *restrict _pixels, \
+static void FUNCC(add_pixels8 ## suffix)(uint8_t *av_restrict _pixels, \
DCTELEM *_block, \
int line_size) \
{ \
int i; \
- pixel *restrict pixels = (pixel *restrict)_pixels; \
+ pixel *av_restrict pixels = (pixel *av_restrict)_pixels; \
dctcoef *block = (dctcoef*)_block; \
line_size /= sizeof(pixel); \
\
} \
} \
\
-static void FUNCC(add_pixels4 ## suffix)(uint8_t *restrict _pixels, \
+static void FUNCC(add_pixels4 ## suffix)(uint8_t *av_restrict _pixels, \
DCTELEM *_block, \
int line_size) \
{ \
int i; \
- pixel *restrict pixels = (pixel *restrict)_pixels; \
+ pixel *av_restrict pixels = (pixel *av_restrict)_pixels; \
dctcoef *block = (dctcoef*)_block; \
line_size /= sizeof(pixel); \
\
int i;\
stride >>= sizeof(pixel)-1;\
\
- assert(x<8 && y<8 && x>=0 && y>=0);\
+ av_assert2(x<8 && y<8 && x>=0 && y>=0);\
\
if(D){\
for(i=0; i<h; i++){\
int i;\
stride >>= sizeof(pixel)-1;\
\
- assert(x<8 && y<8 && x>=0 && y>=0);\
+ av_assert2(x<8 && y<8 && x>=0 && y>=0);\
\
if(D){\
for(i=0; i<h; i++){\