diff options
author | James Almer <jamrial@gmail.com> | 2017-03-23 18:17:45 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-03-23 18:17:45 -0300 |
commit | 09a80419b73d804d7071194789976b7024ec888f (patch) | |
tree | 63c306a3c3fb6873157dd4c489ad6f96b3c0115d | |
parent | 530066166e3c510c3d9c21ff2ae17400adac3dce (diff) | |
parent | 58224dc5f3d4fea40a8d55cca87291a960c11622 (diff) | |
download | ffmpeg-09a80419b73d804d7071194789976b7024ec888f.tar.gz |
Merge commit '58224dc5f3d4fea40a8d55cca87291a960c11622'
* commit '58224dc5f3d4fea40a8d55cca87291a960c11622':
ppc: avcodec: Drop silly "_ppc" suffixes from files in ppc subdirectories
Merged-by: James Almer <jamrial@gmail.com>
-rw-r--r-- | libavcodec/ppc/Makefile | 2 | ||||
-rw-r--r-- | libavcodec/ppc/videodsp.c (renamed from libavcodec/ppc/videodsp_ppc.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile index ae774a07f2..419bd29c68 100644 --- a/libavcodec/ppc/Makefile +++ b/libavcodec/ppc/Makefile @@ -19,7 +19,7 @@ OBJS-$(CONFIG_MPEGVIDEO) += ppc/mpegvideo_altivec.o \ OBJS-$(CONFIG_MPEGVIDEOENC) += ppc/mpegvideoencdsp.o OBJS-$(CONFIG_PIXBLOCKDSP) += ppc/pixblockdsp.o OBJS-$(CONFIG_VC1DSP) += ppc/vc1dsp_altivec.o -OBJS-$(CONFIG_VIDEODSP) += ppc/videodsp_ppc.o +OBJS-$(CONFIG_VIDEODSP) += ppc/videodsp.o OBJS-$(CONFIG_VP3DSP) += ppc/vp3dsp_altivec.o OBJS-$(CONFIG_VP8DSP) += ppc/vp8dsp_altivec.o diff --git a/libavcodec/ppc/videodsp_ppc.c b/libavcodec/ppc/videodsp.c index 915702252e..915702252e 100644 --- a/libavcodec/ppc/videodsp_ppc.c +++ b/libavcodec/ppc/videodsp.c |