diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-17 19:52:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-17 20:12:02 +0200 |
| commit | 78accb876c173c881082018b169b5cf9fa13e6e1 (patch) | |
| tree | 5dbcaf2ae14a012dafaaf418a650d697f3ef8ea4 /libavcodec/dct-test.c | |
| parent | fc096e2e861e821a743bf9c42abee0fb41fff5d6 (diff) | |
| parent | 08e09ed7db732ebc53b8c60d7a39ac0abd49694f (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ffmpeg: fix some indentation
ffmpeg: fix operation with --disable-avfilter
simple_idct: remove disabled code
motion_est: remove disabled code
vc1: remove disabled code
fate: separate lavf-mxf_d10 test from lavf-mxf
cabac: Move code only used in the cabac test program to cabac.c.
ffplay: warn that -pix_fmt is no longer working, suggest alternative
ffplay: warn that -s is no longer working, suggest alternative
lavf: rename enc variable in utils.c:has_codec_parameters()
lavf: use designated initialisers for all (de)muxers.
wav: remove a use of deprecated AV_METADATA_ macro
rmdec: remove useless ap parameter from rm_read_header_old()
dct-test: remove write-only variable
des: fix #if conditional around P_shuffle
Use LOCAL_ALIGNED in ff_check_alignment()
Conflicts:
ffmpeg.c
libavformat/avidec.c
libavformat/matroskaenc.c
libavformat/mp3enc.c
libavformat/oggenc.c
libavformat/utils.c
tests/ref/lavf/mxf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dct-test.c')
| -rw-r--r-- | libavcodec/dct-test.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 4bc59d3370..d9ec0a5194 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -190,7 +190,6 @@ static void idct_mmx_init(void) DECLARE_ALIGNED(16, static DCTELEM, block)[64]; DECLARE_ALIGNED(8, static DCTELEM, block1)[64]; -DECLARE_ALIGNED(8, static DCTELEM, block_org)[64]; static inline void mmx_emms(void) { @@ -246,9 +245,6 @@ static int dct_error(const struct algo *dct, int test, int is_idct, int speed, c break; } - for (i = 0; i < 64; i++) - block_org[i] = block1[i]; - if (dct->format == MMX_PERM) { for (i = 0; i < 64; i++) block[idct_mmx_perm[i]] = block1[i]; |