diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 22:30:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 22:59:05 +0100 |
| commit | 30981a966f175b424fe94ef04f56c1e9bebe47dd (patch) | |
| tree | 4987fe22402580bb357b184bb1ffa47801bd35e7 /libavcodec/x86 | |
| parent | 922332e60df386f11e559bc5744c979ea65c7f3a (diff) | |
| download | ffmpeg-30981a966f175b424fe94ef04f56c1e9bebe47dd.tar.gz | |
lavc: split snow and dirac DWTs
There is only about 4 lines of common code, so it alot cleaner
when seperated.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/Makefile | 8 | ||||
| -rw-r--r-- | libavcodec/x86/dirac_dwt.c (renamed from libavcodec/x86/dwt.c) | 2 | ||||
| -rw-r--r-- | libavcodec/x86/dirac_dwt.h (renamed from libavcodec/x86/dwt.h) | 6 | ||||
| -rw-r--r-- | libavcodec/x86/snowdsp.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 34254e4fde..6f10d060f9 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -35,17 +35,17 @@ MMX-OBJS += x86/dsputil_mmx.o \ x86/idct_sse2_xvid.o \ x86/simple_idct.o \ -MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp.o \ - x86/dwt.o MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o \ x86/motion_est.o +MMX-OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp.o +MMX-OBJS-$(CONFIG_SNOW_ENCODER) += x86/snowdsp.o MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o -YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o -YASM-OBJS-$(CONFIG_DWT) += x86/dwt_yasm.o +YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\ + x86/dwt_yasm.o x86/dirac_dwt.o YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o YASM-OBJS-$(CONFIG_FFT) += x86/fft.o YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \ diff --git a/libavcodec/x86/dwt.c b/libavcodec/x86/dirac_dwt.c index e718c80fef..fbb25a417c 100644 --- a/libavcodec/x86/dwt.c +++ b/libavcodec/x86/dirac_dwt.c @@ -22,7 +22,7 @@ #include "libavutil/x86/asm.h" #include "dsputil_mmx.h" -#include "dwt.h" +#include "dirac_dwt.h" #define COMPOSE_VERTICAL(ext, align) \ void ff_vertical_compose53iL0##ext(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width); \ diff --git a/libavcodec/x86/dwt.h b/libavcodec/x86/dirac_dwt.h index 199f61175b..126b29029f 100644 --- a/libavcodec/x86/dwt.h +++ b/libavcodec/x86/dirac_dwt.h @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_X86_DWT_H -#define AVCODEC_X86_DWT_H +#ifndef AVCODEC_X86_DIRAC_DWT_H +#define AVCODEC_X86_DIRAC_DWT_H -#include "libavcodec/dwt.h" +#include "libavcodec/dirac_dwt.h" void ff_horizontal_compose_dd97i_end_c(IDWTELEM *b, IDWTELEM *tmp, int w2, int x); void ff_horizontal_compose_haar1i_end_c(IDWTELEM *b, IDWTELEM *tmp, int w2, int x); diff --git a/libavcodec/x86/snowdsp.c b/libavcodec/x86/snowdsp.c index 631291aafe..5505ee8bfd 100644 --- a/libavcodec/x86/snowdsp.c +++ b/libavcodec/x86/snowdsp.c @@ -23,7 +23,7 @@ #include "libavutil/x86/asm.h" #include "libavcodec/avcodec.h" #include "libavcodec/snow.h" -#include "libavcodec/dwt.h" +#include "libavcodec/snow_dwt.h" #include "dsputil_mmx.h" #if HAVE_INLINE_ASM @@ -875,7 +875,7 @@ static void ff_snow_inner_add_yblock_mmx(const uint8_t *obmc, const int obmc_str #endif /* HAVE_INLINE_ASM */ -void ff_dwt_init_x86(DWTContext *c) +void ff_dwt_init_x86(SnowDWTContext *c) { #if HAVE_INLINE_ASM int mm_flags = av_get_cpu_flags(); |