summaryrefslogtreecommitdiff
path: root/libavcodec/x86/vp56dsp_init.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-10-06 20:28:56 +0200
committerDiego Biurrun <diego@biurrun.de>2013-08-23 14:42:19 +0200
commit8506ff97c9ea4a1f52983497ecf8d4ef193403a9 (patch)
treec02b5b1de9259e6f05b0ba373565c12206335109 /libavcodec/x86/vp56dsp_init.c
parent30ce289074e88f528965cb57720674a675639737 (diff)
vp56: Mark VP6-only optimizations as such.
Most of our VP56 optimizations are VP6-only and will stay that way. So avoid compiling them for VP5-only builds.
Diffstat (limited to 'libavcodec/x86/vp56dsp_init.c')
-rw-r--r--libavcodec/x86/vp56dsp_init.c48
1 files changed, 0 insertions, 48 deletions
diff --git a/libavcodec/x86/vp56dsp_init.c b/libavcodec/x86/vp56dsp_init.c
deleted file mode 100644
index 1596273fdd..0000000000
--- a/libavcodec/x86/vp56dsp_init.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * VP6 MMX/SSE2 optimizations
- * Copyright (C) 2009 Sebastien Lucas <sebastien.lucas@gmail.com>
- * Copyright (C) 2009 Zuxy Meng <zuxy.meng@gmail.com>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavutil/cpu.h"
-#include "libavutil/x86/asm.h"
-#include "libavutil/x86/cpu.h"
-#include "libavcodec/vp56dsp.h"
-
-void ff_vp6_filter_diag4_mmx(uint8_t *dst, uint8_t *src, int stride,
- const int16_t *h_weights,const int16_t *v_weights);
-void ff_vp6_filter_diag4_sse2(uint8_t *dst, uint8_t *src, int stride,
- const int16_t *h_weights,const int16_t *v_weights);
-
-av_cold void ff_vp56dsp_init_x86(VP56DSPContext* c, enum AVCodecID codec)
-{
- int cpu_flags = av_get_cpu_flags();
-
- if (CONFIG_VP6_DECODER && codec == AV_CODEC_ID_VP6) {
-#if ARCH_X86_32
- if (EXTERNAL_MMX(cpu_flags)) {
- c->vp6_filter_diag4 = ff_vp6_filter_diag4_mmx;
- }
-#endif
-
- if (EXTERNAL_SSE2(cpu_flags)) {
- c->vp6_filter_diag4 = ff_vp6_filter_diag4_sse2;
- }
- }
-}