diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-05 22:36:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-05 22:36:05 +0100 |
| commit | e859339e7af52210c6fe84a8e6412f0c30d1c4da (patch) | |
| tree | fdbafa085fef7b4de237574f072aca9fbefe6cc5 /libavcodec/x86/vc1dsp_init.c | |
| parent | f0615557e03518b2fdc6d036ba29031a90646011 (diff) | |
| parent | 930e26a3ea9d223e04bac4cdde13697cec770031 (diff) | |
| download | ffmpeg-e859339e7af52210c6fe84a8e6412f0c30d1c4da.tar.gz | |
Merge commit '930e26a3ea9d223e04bac4cdde13697cec770031'
* commit '930e26a3ea9d223e04bac4cdde13697cec770031':
x86: h264qpel: Only define mmxext QPEL functions if H264QPEL is enabled
x86: PABSW: port to cpuflags
x86: vc1dsp: port to cpuflags
rtmp: Use av_strlcat instead of strncat
Conflicts:
libavcodec/x86/h264_qpel.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/vc1dsp_init.c')
| -rw-r--r-- | libavcodec/x86/vc1dsp_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/vc1dsp_init.c b/libavcodec/x86/vc1dsp_init.c index 6d868e8d1a..c359c4acdb 100644 --- a/libavcodec/x86/vc1dsp_init.c +++ b/libavcodec/x86/vc1dsp_init.c @@ -49,7 +49,7 @@ static void vc1_h_loop_filter16_ ## EXT(uint8_t *src, int stride, int pq) \ } #if HAVE_YASM -LOOP_FILTER(mmx2) +LOOP_FILTER(mmxext) LOOP_FILTER(sse2) LOOP_FILTER(ssse3) @@ -98,7 +98,7 @@ av_cold void ff_vc1dsp_init_x86(VC1DSPContext *dsp) } if (mm_flags & AV_CPU_FLAG_MMXEXT) { - ASSIGN_LF(mmx2); + ASSIGN_LF(mmxext); dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_nornd_mmx2; } else if (mm_flags & AV_CPU_FLAG_3DNOW) { dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_nornd_3dnow; |