diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-19 18:45:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-19 18:46:04 +0200 |
| commit | d303e0affd9274381a098da55ef4eca954f23b74 (patch) | |
| tree | 00a54bf98aa0c13c3689ec694b07e50a21102951 /libavcodec/dsputil.c | |
| parent | 257f274dfa000ae0add4aef8bd11375c8d32add0 (diff) | |
| parent | 3e9409b1d0ca6ee7063fa04d940af36a20b46a8b (diff) | |
| download | ffmpeg-d303e0affd9274381a098da55ef4eca954f23b74.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
simple_idct: simplify some ifdeffery
simple_idct: remove code for DCTELEM != int16
Remove VLAs in ff_amrwb_lsp2lpc()
fate: make vsynth tests depend on only the relevant vref
rtsp: remove disabled code
dsputil: restore mistakenly removed hunk of disabled code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 162a36e8aa..cb951709a5 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -174,6 +174,16 @@ static int pix_norm1_c(uint8_t * pix, int line_size) s = 0; for (i = 0; i < 16; i++) { for (j = 0; j < 16; j += 8) { +#if 0 + s += sq[pix[0]]; + s += sq[pix[1]]; + s += sq[pix[2]]; + s += sq[pix[3]]; + s += sq[pix[4]]; + s += sq[pix[5]]; + s += sq[pix[6]]; + s += sq[pix[7]]; +#else #if LONG_MAX > 2147483647 register uint64_t x=*(uint64_t*)pix; s += sq[x&0xff]; @@ -196,6 +206,7 @@ static int pix_norm1_c(uint8_t * pix, int line_size) s += sq[(x>>16)&0xff]; s += sq[(x>>24)&0xff]; #endif +#endif pix += 8; } pix += line_size - 16; |