diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-18 16:43:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-18 16:43:46 +0200 |
| commit | 3c3daf4d198306295e3342631f19422bdc258dbb (patch) | |
| tree | 96087928a24b17dbd893c7ab5dfa5f45a76de4ae /libavcodec/x86 | |
| parent | 93263dc19e441f347baf9c36b5bc83693f16d084 (diff) | |
| parent | 9bc8bcddbd4fc394e2268e9849dcbf3bad6de980 (diff) | |
| download | ffmpeg-3c3daf4d198306295e3342631f19422bdc258dbb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
dsputil: remove disabled code
tta: remove disabled code
gxfenc: place variable declarations before statements
x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template
random_seed: use proper #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 39 | ||||
| -rw-r--r-- | libavcodec/x86/mpegvideo_mmx_template.c | 2 |
2 files changed, 1 insertions, 40 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index c544b43d38..12cd3c35cf 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -1569,10 +1569,6 @@ QPEL_2TAP(put_, 8, 3dnow) QPEL_2TAP(avg_, 8, 3dnow) -#if 0 -static void just_return(void) { return; } -#endif - #if HAVE_YASM typedef void emu_edge_core_func (uint8_t *buf, const uint8_t *src, x86_reg linesize, x86_reg start_y, @@ -2852,39 +2848,4 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) if (CONFIG_ENCODERS) dsputilenc_init_mmx(c, avctx); - -#if 0 - // for speed testing - get_pixels = just_return; - put_pixels_clamped = just_return; - add_pixels_clamped = just_return; - - pix_abs16x16 = just_return; - pix_abs16x16_x2 = just_return; - pix_abs16x16_y2 = just_return; - pix_abs16x16_xy2 = just_return; - - put_pixels_tab[0] = just_return; - put_pixels_tab[1] = just_return; - put_pixels_tab[2] = just_return; - put_pixels_tab[3] = just_return; - - put_no_rnd_pixels_tab[0] = just_return; - put_no_rnd_pixels_tab[1] = just_return; - put_no_rnd_pixels_tab[2] = just_return; - put_no_rnd_pixels_tab[3] = just_return; - - avg_pixels_tab[0] = just_return; - avg_pixels_tab[1] = just_return; - avg_pixels_tab[2] = just_return; - avg_pixels_tab[3] = just_return; - - avg_no_rnd_pixels_tab[0] = just_return; - avg_no_rnd_pixels_tab[1] = just_return; - avg_no_rnd_pixels_tab[2] = just_return; - avg_no_rnd_pixels_tab[3] = just_return; - - //av_fdct = just_return; - //ff_idct = just_return; -#endif } diff --git a/libavcodec/x86/mpegvideo_mmx_template.c b/libavcodec/x86/mpegvideo_mmx_template.c index fb52159576..de6a4724b6 100644 --- a/libavcodec/x86/mpegvideo_mmx_template.c +++ b/libavcodec/x86/mpegvideo_mmx_template.c @@ -98,7 +98,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s, x86_reg last_non_zero_p1; int level=0, q; //=0 is because gcc says uninitialized ... const uint16_t *qmat, *bias; - DECLARE_ALIGNED(16, int16_t, temp_block)[64]; + LOCAL_ALIGNED_16(int16_t, temp_block, [64]); assert((7&(int)(&temp_block[0])) == 0); //did gcc align it correctly? |