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/sparc | |
| 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/sparc')
| -rw-r--r-- | libavcodec/sparc/dsputil_vis.h | 7 | ||||
| -rw-r--r-- | libavcodec/sparc/simple_idct_vis.c | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/sparc/dsputil_vis.h b/libavcodec/sparc/dsputil_vis.h index e1cbcb49e3..d7e2e63ab9 100644 --- a/libavcodec/sparc/dsputil_vis.h +++ b/libavcodec/sparc/dsputil_vis.h @@ -20,10 +20,9 @@ #define AVCODEC_SPARC_DSPUTIL_VIS_H #include <stdint.h> -#include "libavcodec/dsputil.h" -void ff_simple_idct_put_vis(uint8_t *dest, int line_size, DCTELEM *data); -void ff_simple_idct_add_vis(uint8_t *dest, int line_size, DCTELEM *data); -void ff_simple_idct_vis(DCTELEM *data); +void ff_simple_idct_put_vis(uint8_t *dest, int line_size, int16_t *data); +void ff_simple_idct_add_vis(uint8_t *dest, int line_size, int16_t *data); +void ff_simple_idct_vis(int16_t *data); #endif /* AVCODEC_SPARC_DSPUTIL_VIS_H */ diff --git a/libavcodec/sparc/simple_idct_vis.c b/libavcodec/sparc/simple_idct_vis.c index 45ca010588..46345a6b25 100644 --- a/libavcodec/sparc/simple_idct_vis.c +++ b/libavcodec/sparc/simple_idct_vis.c @@ -388,7 +388,7 @@ static const DECLARE_ALIGNED(8, uint16_t, expand)[4] = { "st %%f14, [%12+" dest "] \n\t"\ -void ff_simple_idct_vis(DCTELEM *data) { +void ff_simple_idct_vis(int16_t *data) { int out1, out2, out3, out4; DECLARE_ALIGNED(8, int16_t, temp)[8*8]; @@ -428,7 +428,7 @@ void ff_simple_idct_vis(DCTELEM *data) { ); } -void ff_simple_idct_put_vis(uint8_t *dest, int line_size, DCTELEM *data) { +void ff_simple_idct_put_vis(uint8_t *dest, int line_size, int16_t *data) { int out1, out2, out3, out4, out5; int r1, r2, r3, r4, r5, r6, r7; @@ -478,7 +478,7 @@ void ff_simple_idct_put_vis(uint8_t *dest, int line_size, DCTELEM *data) { ); } -void ff_simple_idct_add_vis(uint8_t *dest, int line_size, DCTELEM *data) { +void ff_simple_idct_add_vis(uint8_t *dest, int line_size, int16_t *data) { int out1, out2, out3, out4, out5, out6; int r1, r2, r3, r4, r5, r6, r7; |