diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2012-09-07 09:39:12 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-09 03:55:56 +0200 |
| commit | e62e455f7b4c5b148f5a289ba823dcc71d6ca389 (patch) | |
| tree | 9d7767b8fca714cc861e8adce6fd8b65aa43d319 /libavcodec/dsputil_template.c | |
| parent | d48ebfbdea50d7f3a4e61e772b92960ff7b8d4ea (diff) | |
| download | android_external_ffmpeg-e62e455f7b4c5b148f5a289ba823dcc71d6ca389.tar.gz android_external_ffmpeg-e62e455f7b4c5b148f5a289ba823dcc71d6ca389.tar.bz2 android_external_ffmpeg-e62e455f7b4c5b148f5a289ba823dcc71d6ca389.zip | |
dsputil/me/pixels: Actually use av_restrict
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil_template.c')
| -rw-r--r-- | libavcodec/dsputil_template.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c index cef7cca5fc..1967e1674f 100644 --- a/libavcodec/dsputil_template.c +++ b/libavcodec/dsputil_template.c @@ -193,12 +193,12 @@ void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src, int linesize, i } #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 */ \ @@ -216,12 +216,12 @@ static void FUNCC(get_pixels ## suffix)(DCTELEM *restrict _block, \ } \ } \ \ -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); \ \ @@ -239,12 +239,12 @@ static void FUNCC(add_pixels8 ## suffix)(uint8_t *restrict _pixels, \ } \ } \ \ -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); \ \ |