diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-18 02:23:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-18 03:04:44 +0100 |
| commit | 1bdc212a39312bd5914d643a4e664b4599477d8c (patch) | |
| tree | 19fcd489c7ec86908e240f1d6f6752d587dc97e7 /libavcodec/dct-test.c | |
| parent | 1a2484fc4e5c5effc32c55c2f25670ec23cbf57b (diff) | |
| parent | 0ea5b44275aa334528eb384a6548cc9f98c50a17 (diff) | |
| download | ffmpeg-1bdc212a39312bd5914d643a4e664b4599477d8c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: link test programs with static libraries
dct-test: remove unused variable cropTbl
swscale: fix overflow in gray16 vertical scaling.
get_bits: remove LAST_SKIP_CACHE macro
swscale: fix integer overflows in RGB pixel writing.
swscale: add endian conversion for RGB555 and RGB444 pixel formats
swscale: fix overflows in output of RGB48 pixels.
get_bits: remove strange/obsolete comments
get_bits: whitespace (mostly) cosmetics
swscale: add rgb565 endianess conversion
get_bits: remove unnecessary #includes
mp3dec: hack: fix decoding with safe bitstream reader
fate: fix eatqi test
adpcm: Check for channels to be a non-zero integer
swscale: fix overflows in RGB rounding constants.
get_bits: introduce safe bitreading to prevent overreads.
Conflicts:
libswscale/swscale.c
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dct-test.c')
| -rw-r--r-- | libavcodec/dct-test.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index dd6987b459..9fdf7d179d 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -170,8 +170,6 @@ static const struct algo idct_tab[] = { #define AANSCALE_BITS 12 -static uint8_t cropTbl[256 + 2 * MAX_NEG_CROP]; - static int64_t gettime(void) { struct timeval tv; @@ -557,13 +555,6 @@ int main(int argc, char **argv) ff_ref_dct_init(); idct_mmx_init(); - for (i = 0; i < 256; i++) - cropTbl[i + MAX_NEG_CROP] = i; - for (i = 0; i < MAX_NEG_CROP; i++) { - cropTbl[i] = 0; - cropTbl[i + MAX_NEG_CROP + 256] = 255; - } - for (;;) { c = getopt(argc, argv, "ih4t"); if (c == -1) |