diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-23 11:01:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-23 11:01:46 +0200 |
| commit | 0a73803c86f6f4e8db379d8514cccdd8a9d7b9ee (patch) | |
| tree | 88c1e1cb1b855c90ec9b128e71ca2a62b80b3eb4 /libavfilter/x86 | |
| parent | 5056cff12597d57fe9a6bd327aee63de8b1f7ce3 (diff) | |
| parent | c1ad70c3cb0588254d66265578cfb14580dc0b94 (diff) | |
| download | ffmpeg-0a73803c86f6f4e8db379d8514cccdd8a9d7b9ee.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Move some conditional code around to avoid unused variable warnings
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/x86')
| -rw-r--r-- | libavfilter/x86/vf_gradfun.c | 2 | ||||
| -rw-r--r-- | libavfilter/x86/vf_yadif_init.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/x86/vf_gradfun.c b/libavfilter/x86/vf_gradfun.c index 214e764192..10accca105 100644 --- a/libavfilter/x86/vf_gradfun.c +++ b/libavfilter/x86/vf_gradfun.c @@ -200,9 +200,9 @@ static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, const uint16_t * av_cold void ff_gradfun_init_x86(GradFunContext *gf) { +#if HAVE_MMXEXT_INLINE int cpu_flags = av_get_cpu_flags(); -#if HAVE_MMXEXT_INLINE if (cpu_flags & AV_CPU_FLAG_MMXEXT) gf->filter_line = gradfun_filter_line_mmxext; #endif diff --git a/libavfilter/x86/vf_yadif_init.c b/libavfilter/x86/vf_yadif_init.c index 58f2fc60d5..0043931e66 100644 --- a/libavfilter/x86/vf_yadif_init.c +++ b/libavfilter/x86/vf_yadif_init.c @@ -61,11 +61,11 @@ void ff_yadif_filter_line_10bit_ssse3(void *dst, void *prev, void *cur, av_cold void ff_yadif_init_x86(YADIFContext *yadif) { +#if HAVE_YASM int cpu_flags = av_get_cpu_flags(); int bit_depth = (!yadif->csp) ? 8 : yadif->csp->comp[0].depth_minus1 + 1; -#if HAVE_YASM if (bit_depth >= 15) { #if ARCH_X86_32 if (EXTERNAL_MMXEXT(cpu_flags)) |