MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dnxhdenc: x86: more sensible names for optimization file and init function

Browse Source
This commit is contained in:
Diego Biurrun 2012-08-13 12:20:07 +02:00
parent f1e06d37c9
commit 26ce9aec03
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/dnxhdenc.c
View File

@ -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;

2
libavcodec/dnxhdenc.h
View File

@ -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 */

2
libavcodec/x86/Makefile
View File

@ -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

2
libavcodec/x86/dnxhd_mmx.c → libavcodec/x86/dnxhdenc.c
View File

@ -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) {