Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '88bd7fdc82'

Browse source 
* commit '88bd7fdc82':
  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>
This commit is contained in:
Michael Niedermayer 2013-01-23 17:44:56 +01:00
commit ac8987591f
169 changed files with 929 additions and 907 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libavcodec/sparc/simple_idct_vis.c
View file

@ -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;