Revision 2480c390

View differences:

libavcodec/dsputil.c
3788 3788

  
3789 3789
static int dct_sad8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3790 3790
    MpegEncContext * const s= (MpegEncContext *)c;
3791
    DECLARE_ALIGNED_16(uint64_t, aligned_temp)[sizeof(DCTELEM)*64/8];
3792
    DCTELEM * const temp= (DCTELEM*)aligned_temp;
3791
    DECLARE_ALIGNED_16(DCTELEM, temp)[64];
3793 3792

  
3794 3793
    assert(h==8);
3795 3794

  
......
3853 3852

  
3854 3853
static int dct_max8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3855 3854
    MpegEncContext * const s= (MpegEncContext *)c;
3856
    DECLARE_ALIGNED_16(uint64_t, aligned_temp)[sizeof(DCTELEM)*64/8];
3857
    DCTELEM * const temp= (DCTELEM*)aligned_temp;
3855
    DECLARE_ALIGNED_16(DCTELEM, temp)[64];
3858 3856
    int sum=0, i;
3859 3857

  
3860 3858
    assert(h==8);
......
3870 3868

  
3871 3869
static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3872 3870
    MpegEncContext * const s= (MpegEncContext *)c;
3873
    DECLARE_ALIGNED_16(uint64_t, aligned_temp)[sizeof(DCTELEM)*64*2/8];
3874
    DCTELEM * const temp= (DCTELEM*)aligned_temp;
3875
    DCTELEM * const bak = ((DCTELEM*)aligned_temp)+64;
3871
    DECLARE_ALIGNED_16(DCTELEM, temp)[64*2];
3872
    DCTELEM * const bak = temp+64;
3876 3873
    int sum=0, i;
3877 3874

  
3878 3875
    assert(h==8);
......
3895 3892
static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3896 3893
    MpegEncContext * const s= (MpegEncContext *)c;
3897 3894
    const uint8_t *scantable= s->intra_scantable.permutated;
3898
    DECLARE_ALIGNED_16(uint64_t, aligned_temp)[sizeof(DCTELEM)*64/8];
3899
    DECLARE_ALIGNED_16(uint64_t, aligned_src1)[8];
3900
    DECLARE_ALIGNED_16(uint64_t, aligned_src2)[8];
3901
    DCTELEM * const temp= (DCTELEM*)aligned_temp;
3902
    uint8_t * const lsrc1 = (uint8_t*)aligned_src1;
3903
    uint8_t * const lsrc2 = (uint8_t*)aligned_src2;
3895
    DECLARE_ALIGNED_16(DCTELEM, temp)[64];
3896
    DECLARE_ALIGNED_16(uint8_t, lsrc1)[64];
3897
    DECLARE_ALIGNED_16(uint8_t, lsrc2)[64];
3904 3898
    int i, last, run, bits, level, distortion, start_i;
3905 3899
    const int esc_length= s->ac_esc_length;
3906 3900
    uint8_t * length;
......
3974 3968
static int bit8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3975 3969
    MpegEncContext * const s= (MpegEncContext *)c;
3976 3970
    const uint8_t *scantable= s->intra_scantable.permutated;
3977
    DECLARE_ALIGNED_16(uint64_t, aligned_temp)[sizeof(DCTELEM)*64/8];
3978
    DCTELEM * const temp= (DCTELEM*)aligned_temp;
3971
    DECLARE_ALIGNED_16(DCTELEM, temp)[64];
3979 3972
    int i, last, run, bits, level, start_i;
3980 3973
    const int esc_length= s->ac_esc_length;
3981 3974
    uint8_t * length;

Also available in: Unified diff