diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 12:04:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 13:01:30 +0200 |
| commit | 98298eb1034bddb4557fa689553dae793c2b0092 (patch) | |
| tree | d35dcd981b6647c9f538bc9b346ab806864bc359 /libavfilter | |
| parent | f3683349aecf3be4c9c875186a812c0cde8ecf41 (diff) | |
| parent | ec36aa69448f20a78d8c4588265022e0b2272ab5 (diff) | |
Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'
* commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5':
x86: Fix linking with some or all of yasm, mmx, optimizations disabled
configure: Add more fine-grained SSE CPU capabilities flags
avfilter: x86: Use more precise compile template names
x86: cosmetics: Comment some #endifs for better readability
g723_1: add comfort noise generation
utvideoenc: Switch to dsputils' median prediction
utvideoenc: Avoid writing into the input picture
avtools: remove the distinction between func_arg and func2_arg.
avconv: make the -passlogfile option per-stream.
avconv: make the -pass option per-stream.
cmdutils: make -codecs print lossy/lossless flags.
lavc: add lossy/lossless codec properties.
Conflicts:
Changelog
cmdutils.c
configure
doc/APIchanges
ffmpeg.h
ffmpeg_opt.c
ffprobe.c
libavcodec/codec_desc.c
libavcodec/g723_1.c
libavcodec/utvideoenc.c
libavcodec/version.h
libavcodec/x86/mpegaudiodec.c
libavcodec/x86/rv40dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/x86/yadif.c | 4 | ||||
| -rw-r--r-- | libavfilter/x86/yadif_template.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/x86/yadif.c b/libavfilter/x86/yadif.c index 4fb101c691..07790d9c3e 100644 --- a/libavfilter/x86/yadif.c +++ b/libavfilter/x86/yadif.c @@ -31,7 +31,7 @@ DECLARE_ASM_CONST(16, const xmm_reg, pb_1) = {0x0101010101010101ULL, 0x010101010 DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x0001000100010001ULL, 0x0001000100010001ULL}; #if HAVE_SSSE3 -#define COMPILE_TEMPLATE_SSE 1 +#define COMPILE_TEMPLATE_SSE2 1 #define COMPILE_TEMPLATE_SSSE3 1 #undef RENAME #define RENAME(a) a ## _ssse3 @@ -43,7 +43,7 @@ DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x0001000100010001ULL, 0x000100010 #undef RENAME #define RENAME(a) a ## _sse2 #include "yadif_template.c" -#undef COMPILE_TEMPLATE_SSE +#undef COMPILE_TEMPLATE_SSE2 #endif #if HAVE_MMXEXT diff --git a/libavfilter/x86/yadif_template.c b/libavfilter/x86/yadif_template.c index e2d450e288..674c088471 100644 --- a/libavfilter/x86/yadif_template.c +++ b/libavfilter/x86/yadif_template.c @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef COMPILE_TEMPLATE_SSE +#ifdef COMPILE_TEMPLATE_SSE2 #define MM "%%xmm" #define MOV "movq" #define MOVQ "movdqa" |