diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-08-13 12:20:07 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-08-24 02:23:15 +0200 |
| commit | 26ce9aec03d925b1ff4beaea462252ad1d7d2c61 (patch) | |
| tree | c94c14a763973c54c67045e6f6eee7f71168f3b8 | |
| parent | f1e06d37c934e8f908d40207ceeba60fc55b5391 (diff) | |
| download | ffmpeg-26ce9aec03d925b1ff4beaea462252ad1d7d2c61.tar.gz | |
dnxhdenc: x86: more sensible names for optimization file and init function
| -rw-r--r-- | libavcodec/dnxhdenc.c | 5 | ||||
| -rw-r--r-- | libavcodec/dnxhdenc.h | 2 | ||||
| -rw-r--r-- | libavcodec/x86/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/x86/dnxhdenc.c (renamed from libavcodec/x86/dnxhd_mmx.c) | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 523d1c078f..0ddbbe130e 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -274,9 +274,8 @@ static int dnxhd_encode_init(AVCodecContext *avctx) ctx->block_width_l2 = 3; } -#if HAVE_MMX - ff_dnxhd_init_mmx(ctx); -#endif + if (ARCH_X86) + ff_dnxhdenc_init_x86(ctx); ctx->m.mb_height = (avctx->height + 15) / 16; ctx->m.mb_width = (avctx->width + 15) / 16; diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index 7e2f96f9d2..4484cf8023 100644 --- a/libavcodec/dnxhdenc.h +++ b/libavcodec/dnxhdenc.h @@ -95,6 +95,6 @@ typedef struct DNXHDEncContext { void (*get_pixels_8x4_sym)(DCTELEM * /*align 16*/, const uint8_t *, int); } DNXHDEncContext; -void ff_dnxhd_init_mmx(DNXHDEncContext *ctx); +void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx); #endif /* AVCODEC_DNXHDENC_H */ diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 5128583ff3..bb4d4a7a1e 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -14,7 +14,7 @@ MMX-OBJS += x86/dsputil_mmx.o \ MMX-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o MMX-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o -MMX-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhd_mmx.o +MMX-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp_mmx.o MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o MMX-OBJS-$(CONFIG_FFT) += x86/fft_init.o diff --git a/libavcodec/x86/dnxhd_mmx.c b/libavcodec/x86/dnxhdenc.c index 12fe3ae55f..c344afec55 100644 --- a/libavcodec/x86/dnxhd_mmx.c +++ b/libavcodec/x86/dnxhdenc.c @@ -54,7 +54,7 @@ static void get_pixels_8x4_sym_sse2(DCTELEM *block, const uint8_t *pixels, int l #endif /* HAVE_INLINE_ASM */ -void ff_dnxhd_init_mmx(DNXHDEncContext *ctx) +void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx) { #if HAVE_INLINE_ASM if (av_get_cpu_flags() & AV_CPU_FLAG_SSE2) { |