[FFmpeg-cvslog] Merge commit '58224dc5f3d4fea40a8d55cca87291a960c11622'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 23 18:17:45 2017 -0300| [09a80419b73d804d7071194789976b7024ec888f] | committer: James Almer

Merge commit '58224dc5f3d4fea40a8d55cca87291a960c11622'

* commit '58224dc5f3d4fea40a8d55cca87291a960c11622':
  ppc: avcodec: Drop silly "_ppc" suffixes from files in ppc subdirectories

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09a80419b73d804d7071194789976b7024ec888f
---

 libavcodec/ppc/Makefile                       | 2 +-
 libavcodec/ppc/{videodsp_ppc.c => videodsp.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile
index ae774a0..419bd29 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
similarity index 100%
rename from libavcodec/ppc/videodsp_ppc.c
rename to libavcodec/ppc/videodsp.c


======================================================================