diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 03:51:04 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 03:51:04 +0200 |
commit | d7e5aebae7652ac766034f1d90e5a4f62677fb3c (patch) | |
tree | b77ee45f34455cf9aa6e28105a7533ecc204b898 /libavcodec/dct-test.c | |
parent | 93c28a55fd84280d97c3c0dd7b0d546043242c34 (diff) | |
parent | 79ee8977c25eee2408ef7b2822f377a983e4d65b (diff) | |
download | ffmpeg-streaming-d7e5aebae7652ac766034f1d90e5a4f62677fb3c.zip ffmpeg-streaming-d7e5aebae7652ac766034f1d90e5a4f62677fb3c.tar.gz |
Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
ac3enc: correct the flipped sign in the ac3_fixed encoder
Eliminate pointless '#if 1' statements without matching '#else'.
Add AVX FFT implementation.
Increase alignment of av_malloc() as needed by AVX ASM.
Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
documentation: extend documentation for ffmpeg -aspect option
APIChanges: update commit hashes for recent additions.
lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
aac: add headers needed for log2f()
lavc: remove FF_API_MB_Q cruft
lavc: remove FF_API_RATE_EMU cruft
lavc: remove FF_API_HURRY_UP cruft
pad: make the filter parametric
vsrc_movie: add key_frame and pict_type.
vsrc_movie: fix leak in request_frame()
lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
vsrc_buffer: add sample_aspect_ratio fields to arguments.
lavfi: add fieldorder filter
scale: make the filter parametric
...
Conflicts:
Changelog
doc/filters.texi
ffmpeg.c
libavcodec/ac3dec.h
libavcodec/dsputil.c
libavfilter/avfilter.h
libavfilter/vf_scale.c
libavfilter/vf_yadif.c
libavfilter/vsrc_buffer.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dct-test.c')
-rw-r--r-- | libavcodec/dct-test.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index b45f23e..f8e981b 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -312,18 +312,16 @@ static void dct_error(const char *name, int is_idct, } for(i=0; i<64; i++) sysErrMax= FFMAX(sysErrMax, FFABS(sysErr[i])); -#if 1 // dump systematic errors for(i=0; i<64; i++){ if(i%8==0) printf("\n"); printf("%7d ", (int)sysErr[i]); } printf("\n"); -#endif printf("%s %s: err_inf=%d err2=%0.8f syserr=%0.8f maxout=%d blockSumErr=%d\n", is_idct ? "IDCT" : "DCT", name, err_inf, (double)err2 / NB_ITS / 64.0, (double)sysErrMax / NB_ITS, maxout, blockSumErrMax); -#if 1 //Speed test + /* speed test */ for(i=0;i<64;i++) block1[i] = 0; @@ -376,7 +374,6 @@ static void dct_error(const char *name, int is_idct, printf("%s %s: %0.1f kdct/s\n", is_idct ? "IDCT" : "DCT", name, (double)it1 * 1000.0 / (double)ti1); -#endif } DECLARE_ALIGNED(8, static uint8_t, img_dest)[64]; |