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 /libavcodec/ppc/Makefile | |
| 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>
Diffstat (limited to 'libavcodec/ppc/Makefile')
| -rw-r--r-- | libavcodec/ppc/Makefile | 6 |
1 files changed, 3 insertions, 3 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 |