MSVC-compatible __align8/__align16 declaration
patch by Steve Lhomme, steve .dot. lhomme .at. free .dot. fr Originally committed as revision 4942 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
04c669ba98
commit
68b51e58ce
19 changed files with 82 additions and 73 deletions
|
@ -62,7 +62,7 @@ const uint8_t ff_zigzag248_direct[64] = {
|
|||
};
|
||||
|
||||
/* not permutated inverse zigzag_direct + 1 for MMX quantizer */
|
||||
uint16_t __align8 inv_zigzag_direct16[64] = {0, };
|
||||
DECLARE_ALIGNED_8(uint16_t, inv_zigzag_direct16[64]) = {0, };
|
||||
|
||||
const uint8_t ff_alternate_horizontal_scan[64] = {
|
||||
0, 1, 2, 3, 8, 9, 16, 17,
|
||||
|
@ -3402,7 +3402,7 @@ static int hadamard8_intra8x8_c(/*MpegEncContext*/ void *s, uint8_t *src, uint8_
|
|||
|
||||
static int dct_sad8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
|
||||
MpegEncContext * const s= (MpegEncContext *)c;
|
||||
uint64_t __align8 aligned_temp[sizeof(DCTELEM)*64/8];
|
||||
DECLARE_ALIGNED_8(uint64_t, aligned_temp[sizeof(DCTELEM)*64/8]);
|
||||
DCTELEM * const temp= (DCTELEM*)aligned_temp;
|
||||
int sum=0, i;
|
||||
|
||||
|
@ -3472,7 +3472,7 @@ static int dct264_sad8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *s
|
|||
|
||||
static int dct_max8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
|
||||
MpegEncContext * const s= (MpegEncContext *)c;
|
||||
uint64_t __align8 aligned_temp[sizeof(DCTELEM)*64/8];
|
||||
DECLARE_ALIGNED_8(uint64_t, aligned_temp[sizeof(DCTELEM)*64/8]);
|
||||
DCTELEM * const temp= (DCTELEM*)aligned_temp;
|
||||
int sum=0, i;
|
||||
|
||||
|
@ -3491,7 +3491,7 @@ void simple_idct(DCTELEM *block); //FIXME
|
|||
|
||||
static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
|
||||
MpegEncContext * const s= (MpegEncContext *)c;
|
||||
uint64_t __align8 aligned_temp[sizeof(DCTELEM)*64*2/8];
|
||||
DECLARE_ALIGNED_8 (uint64_t, aligned_temp[sizeof(DCTELEM)*64*2/8]);
|
||||
DCTELEM * const temp= (DCTELEM*)aligned_temp;
|
||||
DCTELEM * const bak = ((DCTELEM*)aligned_temp)+64;
|
||||
int sum=0, i;
|
||||
|
@ -3516,8 +3516,8 @@ static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *s
|
|||
static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
|
||||
MpegEncContext * const s= (MpegEncContext *)c;
|
||||
const uint8_t *scantable= s->intra_scantable.permutated;
|
||||
uint64_t __align8 aligned_temp[sizeof(DCTELEM)*64/8];
|
||||
uint64_t __align8 aligned_bak[stride];
|
||||
DECLARE_ALIGNED_8 (uint64_t, aligned_temp[sizeof(DCTELEM)*64/8]);
|
||||
DECLARE_ALIGNED_8 (uint64_t, aligned_bak[stride]);
|
||||
DCTELEM * const temp= (DCTELEM*)aligned_temp;
|
||||
uint8_t * const bak= (uint8_t*)aligned_bak;
|
||||
int i, last, run, bits, level, distoration, start_i;
|
||||
|
@ -3595,7 +3595,7 @@ static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int
|
|||
static int bit8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
|
||||
MpegEncContext * const s= (MpegEncContext *)c;
|
||||
const uint8_t *scantable= s->intra_scantable.permutated;
|
||||
uint64_t __align8 aligned_temp[sizeof(DCTELEM)*64/8];
|
||||
DECLARE_ALIGNED_8 (uint64_t, aligned_temp[sizeof(DCTELEM)*64/8]);
|
||||
DCTELEM * const temp= (DCTELEM*)aligned_temp;
|
||||
int i, last, run, bits, level, start_i;
|
||||
const int esc_length= s->ac_esc_length;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue