---
libavcodec/dnxhdenc.c | 5 ++---
libavcodec/dnxhdenc.h | 2 +-
libavcodec/x86/Makefile | 2 +-
libavcodec/x86/{dnxhd_mmx.c => dnxhdenc.c} | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
rename libavcodec/x86/{dnxhd_mmx.c => dnxhdenc.c} (98%)
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 523d1c0..e4cf10d 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_dnxhd_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 7e2f96f..0ba5da1 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_dnxhd_init_x86(DNXHDEncContext *ctx);
#endif /* AVCODEC_DNXHDENC_H */
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index ad13367..cd58f63 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -15,7 +15,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
similarity index 98%
rename from libavcodec/x86/dnxhd_mmx.c
rename to libavcodec/x86/dnxhdenc.c
index 12fe3ae..e7358e3 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_dnxhd_init_x86(DNXHDEncContext *ctx)
{
#if HAVE_INLINE_ASM
if (av_get_cpu_flags() & AV_CPU_FLAG_SSE2) {
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
