diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 17:44:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 17:44:56 +0100 |
| commit | ac8987591f5503768e7587c25693928f26fcb3d1 (patch) | |
| tree | 2531b37d6673aea7f4d1c61549978664a2c807ac /libavcodec/dsputil_template.c | |
| parent | a793a587df05bfc789e040c13329825cf9a261a3 (diff) | |
| parent | 88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f (diff) | |
| download | ffmpeg-ac8987591f5503768e7587c25693928f26fcb3d1.tar.gz | |
Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
Drop DCTELEM typedef
Conflicts:
libavcodec/alpha/dsputil_alpha.h
libavcodec/alpha/motion_est_alpha.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/bfin/dsputil_bfin.h
libavcodec/bfin/pixels_bfin.S
libavcodec/cavs.c
libavcodec/cavsdec.c
libavcodec/dct-test.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/eamad.c
libavcodec/h264_cavlc.c
libavcodec/h264idct_template.c
libavcodec/mpeg12.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/proresdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil_template.c')
| -rw-r--r-- | libavcodec/dsputil_template.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c index 5162304d05..3c98086a64 100644 --- a/libavcodec/dsputil_template.c +++ b/libavcodec/dsputil_template.c @@ -114,7 +114,7 @@ static void FUNCC(draw_edges)(uint8_t *p_buf, int p_wrap, int width, int height, } #define DCTELEM_FUNCS(dctcoef, suffix) \ -static void FUNCC(get_pixels ## suffix)(DCTELEM *av_restrict _block, \ +static void FUNCC(get_pixels ## suffix)(int16_t *av_restrict _block, \ const uint8_t *_pixels, \ int line_size) \ { \ @@ -138,7 +138,7 @@ static void FUNCC(get_pixels ## suffix)(DCTELEM *av_restrict _block, \ } \ \ static void FUNCC(add_pixels8 ## suffix)(uint8_t *av_restrict _pixels, \ - DCTELEM *_block, \ + int16_t *_block, \ int line_size) \ { \ int i; \ @@ -161,7 +161,7 @@ static void FUNCC(add_pixels8 ## suffix)(uint8_t *av_restrict _pixels, \ } \ \ static void FUNCC(add_pixels4 ## suffix)(uint8_t *av_restrict _pixels, \ - DCTELEM *_block, \ + int16_t *_block, \ int line_size) \ { \ int i; \ @@ -179,20 +179,20 @@ static void FUNCC(add_pixels4 ## suffix)(uint8_t *av_restrict _pixels, \ } \ } \ \ -static void FUNCC(clear_block ## suffix)(DCTELEM *block) \ +static void FUNCC(clear_block ## suffix)(int16_t *block) \ { \ memset(block, 0, sizeof(dctcoef)*64); \ } \ \ /** \ - * memset(blocks, 0, sizeof(DCTELEM)*6*64) \ + * memset(blocks, 0, sizeof(int16_t)*6*64) \ */ \ -static void FUNCC(clear_blocks ## suffix)(DCTELEM *blocks) \ +static void FUNCC(clear_blocks ## suffix)(int16_t *blocks) \ { \ memset(blocks, 0, sizeof(dctcoef)*6*64); \ } -DCTELEM_FUNCS(DCTELEM, _16) +DCTELEM_FUNCS(int16_t, _16) #if BIT_DEPTH > 8 DCTELEM_FUNCS(dctcoef, _32) #endif |