mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-01 05:56:38 +02:00
Merge commit '6b110d3a739c31602b59887ad65c67025df3f49d'
* commit '6b110d3a739c31602b59887ad65c67025df3f49d': ppc: More consistent names for H.264 optimizations files mpegaudiosp: More consistent names for ppc/x86 optimization files Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3ad5d8694c
@ -2,7 +2,7 @@ OBJS += ppc/dsputil_ppc.o \
|
||||
ppc/videodsp_ppc.o \
|
||||
|
||||
OBJS-$(CONFIG_H264CHROMA) += ppc/h264chroma_init.o
|
||||
OBJS-$(CONFIG_H264QPEL) += ppc/h264_qpel.o
|
||||
OBJS-$(CONFIG_H264QPEL) += ppc/h264qpel.o
|
||||
OBJS-$(CONFIG_HPELDSP) += ppc/hpeldsp_altivec.o
|
||||
OBJS-$(CONFIG_VORBIS_DECODER) += ppc/vorbisdsp_altivec.o
|
||||
OBJS-$(CONFIG_VP3DSP) += ppc/vp3dsp_altivec.o
|
||||
@ -10,8 +10,8 @@ OBJS-$(CONFIG_VP3DSP) += ppc/vp3dsp_altivec.o
|
||||
FFT-OBJS-$(HAVE_GNU_AS) += ppc/fft_altivec_s.o
|
||||
ALTIVEC-OBJS-$(CONFIG_FFT) += ppc/fft_altivec.o \
|
||||
$(FFT-OBJS-yes)
|
||||
ALTIVEC-OBJS-$(CONFIG_H264DSP) += ppc/h264_altivec.o
|
||||
ALTIVEC-OBJS-$(CONFIG_MPEGAUDIODSP) += ppc/mpegaudiodec_altivec.o
|
||||
ALTIVEC-OBJS-$(CONFIG_H264DSP) += ppc/h264dsp.o
|
||||
ALTIVEC-OBJS-$(CONFIG_MPEGAUDIODSP) += ppc/mpegaudiodsp_altivec.o
|
||||
ALTIVEC-OBJS-$(CONFIG_MPEGVIDEO) += ppc/mpegvideo_altivec.o
|
||||
ALTIVEC-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o
|
||||
ALTIVEC-OBJS-$(CONFIG_VP8_DECODER) += ppc/vp8dsp_altivec.o
|
||||
|
@ -39,7 +39,7 @@
|
||||
#define PREFIX_h264_qpel16_v_lowpass_num altivec_put_h264_qpel16_v_lowpass_num
|
||||
#define PREFIX_h264_qpel16_hv_lowpass_altivec put_h264_qpel16_hv_lowpass_altivec
|
||||
#define PREFIX_h264_qpel16_hv_lowpass_num altivec_put_h264_qpel16_hv_lowpass_num
|
||||
#include "h264_qpel_template.c"
|
||||
#include "h264qpel_template.c"
|
||||
#undef OP_U8_ALTIVEC
|
||||
#undef PREFIX_h264_qpel16_h_lowpass_altivec
|
||||
#undef PREFIX_h264_qpel16_h_lowpass_num
|
||||
@ -55,7 +55,7 @@
|
||||
#define PREFIX_h264_qpel16_v_lowpass_num altivec_avg_h264_qpel16_v_lowpass_num
|
||||
#define PREFIX_h264_qpel16_hv_lowpass_altivec avg_h264_qpel16_hv_lowpass_altivec
|
||||
#define PREFIX_h264_qpel16_hv_lowpass_num altivec_avg_h264_qpel16_hv_lowpass_num
|
||||
#include "h264_qpel_template.c"
|
||||
#include "h264qpel_template.c"
|
||||
#undef OP_U8_ALTIVEC
|
||||
#undef PREFIX_h264_qpel16_h_lowpass_altivec
|
||||
#undef PREFIX_h264_qpel16_h_lowpass_num
|
@ -13,7 +13,7 @@ OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel.o
|
||||
OBJS-$(CONFIG_HPELDSP) += x86/hpeldsp_init.o
|
||||
OBJS-$(CONFIG_LPC) += x86/lpc.o
|
||||
OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
|
||||
OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec.o
|
||||
OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodsp.o
|
||||
OBJS-$(CONFIG_MPEGVIDEO) += x86/mpegvideo.o
|
||||
OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoenc.o
|
||||
OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o
|
||||
|
Loading…
Reference in New Issue
Block a user