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/x86 | |
| 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/x86')
| -rw-r--r-- | libavcodec/x86/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/x86/mpegaudiodsp.c (renamed from libavcodec/x86/mpegaudiodec.c) | 0 |
2 files changed, 1 insertions, 1 deletions
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 |