[FFmpeg-cvslog] Revert "avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation"

[Philip Langdale]

ffmpeg | branch: master | Philip Langdale <philipl at overt.org> | Sat Jun  6 10:42:00 2015 -0700| [c10e6bcb43ad5fca3f60b26ca035cfbfac42aaa4] | committer: Philip Langdale

Revert "avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation"

This reverts commit d0d0913702358c61dfb9c5ac8b141cd203524869.

Signed-off-by: Philip Langdale <philipl at overt.org>

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

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

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0931498..bfd6425 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -92,7 +92,7 @@ OBJS-$(CONFIG_MPEGVIDEO)               += mpegvideo.o mpegvideodsp.o rl.o \
 OBJS-$(CONFIG_MPEGVIDEOENC)            += mpegvideo_enc.o mpeg12data.o  \
                                           motion_est.o ratecontrol.o    \
                                           mpegvideoencdsp.o
-OBJS-$(CONFIG_NVENC)                   += nvenc_a.o
+OBJS-$(CONFIG_NVENC)                   += nvenc.o
 OBJS-$(CONFIG_PIXBLOCKDSP)             += pixblockdsp.o
 OBJS-$(CONFIG_QPELDSP)                 += qpeldsp.o
 OBJS-$(CONFIG_QSV)                     += qsv.o
diff --git a/libavcodec/nvenc_a.c b/libavcodec/nvenc.c
similarity index 100%
rename from libavcodec/nvenc_a.c
rename to libavcodec/nvenc.c