diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 17:53:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 17:53:33 +0200 |
| commit | 3ad5d8694c769301a6054ed85dfdcb17240faa89 (patch) | |
| tree | b20407645140fcaa8e4add9a0bfd07f04f620cac | |
| parent | 2514b80045d56411343df80f07276817b5f0d1b0 (diff) | |
| parent | 6b110d3a739c31602b59887ad65c67025df3f49d (diff) | |
| download | ffmpeg-3ad5d8694c769301a6054ed85dfdcb17240faa89.tar.gz | |
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>
| -rw-r--r-- | libavcodec/ppc/Makefile | 6 | ||||
| -rw-r--r-- | libavcodec/ppc/h264dsp.c (renamed from libavcodec/ppc/h264_altivec.c) | 0 | ||||
| -rw-r--r-- | libavcodec/ppc/h264qpel.c (renamed from libavcodec/ppc/h264_qpel.c) | 4 | ||||
| -rw-r--r-- | libavcodec/ppc/h264qpel_template.c (renamed from libavcodec/ppc/h264_qpel_template.c) | 0 | ||||
| -rw-r--r-- | libavcodec/ppc/mpegaudiodsp_altivec.c (renamed from libavcodec/ppc/mpegaudiodec_altivec.c) | 0 | ||||
| -rw-r--r-- | libavcodec/x86/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/x86/mpegaudiodsp.c (renamed from libavcodec/x86/mpegaudiodec.c) | 0 |
7 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile index febbb0a231..a7e1c87456 100644 --- a/libavcodec/ppc/Makefile +++ b/libavcodec/ppc/Makefile @@ -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 diff --git a/libavcodec/ppc/h264_altivec.c b/libavcodec/ppc/h264dsp.c index 3c2bb4d630..3c2bb4d630 100644 --- a/libavcodec/ppc/h264_altivec.c +++ b/libavcodec/ppc/h264dsp.c diff --git a/libavcodec/ppc/h264_qpel.c b/libavcodec/ppc/h264qpel.c index 429ae42f40..6747fb3020 100644 --- a/libavcodec/ppc/h264_qpel.c +++ b/libavcodec/ppc/h264qpel.c @@ -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 diff --git a/libavcodec/ppc/h264_qpel_template.c b/libavcodec/ppc/h264qpel_template.c index cfc4560267..cfc4560267 100644 --- a/libavcodec/ppc/h264_qpel_template.c +++ b/libavcodec/ppc/h264qpel_template.c diff --git a/libavcodec/ppc/mpegaudiodec_altivec.c b/libavcodec/ppc/mpegaudiodsp_altivec.c index 1152fd77ac..1152fd77ac 100644 --- a/libavcodec/ppc/mpegaudiodec_altivec.c +++ b/libavcodec/ppc/mpegaudiodsp_altivec.c diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 50e64f72ee..35c82a8948 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -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 diff --git a/libavcodec/x86/mpegaudiodec.c b/libavcodec/x86/mpegaudiodsp.c index 287d8ff126..287d8ff126 100644 --- a/libavcodec/x86/mpegaudiodec.c +++ b/libavcodec/x86/mpegaudiodsp.c |