diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-13 00:13:49 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-13 00:13:49 +0200 |
commit | 1caf614bec297c7e6c5f115d3ba6663d0e682e8e (patch) | |
tree | 3a3a3d6b48cae7857d82d01d1a3cb7714d0355ac /libavcodec/x86 | |
parent | ad6f006081c04532335324a5a72d61f36ec386d7 (diff) | |
parent | 012f04a277d21b2c5f28b3710fbe52321424946e (diff) | |
download | ffmpeg-streaming-1caf614bec297c7e6c5f115d3ba6663d0e682e8e.zip ffmpeg-streaming-1caf614bec297c7e6c5f115d3ba6663d0e682e8e.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: autoinsert resample filter when necessary.
lavfi: add lavr-based audio resampling filter.
x86: vc1: drop MMX loop filter implementation, which uses MMX2 instructions.
Conflicts:
configure
doc/filters.texi
libavcodec/x86/vc1dsp_mmx.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/avfiltergraph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
-rw-r--r-- | libavcodec/x86/vc1dsp_mmx.c | 2 | ||||
-rw-r--r-- | libavcodec/x86/vc1dsp_yasm.asm | 11 |
2 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index 32891a0..d1cb852 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -701,7 +701,6 @@ static void vc1_h_loop_filter16_ ## EXT(uint8_t *src, int stride, int pq) \ } #if HAVE_YASM -LOOP_FILTER(mmx) LOOP_FILTER(mmx2) LOOP_FILTER(sse2) LOOP_FILTER(ssse3) @@ -803,7 +802,6 @@ void ff_vc1dsp_init_mmx(VC1DSPContext *dsp) #if HAVE_YASM if (mm_flags & AV_CPU_FLAG_MMX) { - ASSIGN_LF(mmx); } return; if (mm_flags & AV_CPU_FLAG_MMX2) { diff --git a/libavcodec/x86/vc1dsp_yasm.asm b/libavcodec/x86/vc1dsp_yasm.asm index 1eba3c1..b897580 100644 --- a/libavcodec/x86/vc1dsp_yasm.asm +++ b/libavcodec/x86/vc1dsp_yasm.asm @@ -227,13 +227,6 @@ section .text imul r2, 0x01010101 %endmacro -; I do not know why the sign extension is needed... -%macro PSIGNW_SRA_MMX 2 - psraw %2, 15 - PSIGNW_MMX %1, %2 -%endmacro - - %macro VC1_LF_MMX 1 INIT_MMX cglobal vc1_v_loop_filter_internal_%1 @@ -274,10 +267,6 @@ cglobal vc1_h_loop_filter8_%1, 3,5,0 RET %endmacro -%define PABSW PABSW_MMX -%define PSIGNW PSIGNW_SRA_MMX -VC1_LF_MMX mmx - %define PABSW PABSW_MMX2 VC1_LF_MMX mmx2 |