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

This reverts commit d0d0913702. Signed-off-by: Philip Langdale <philipl@overt.org>
10 years ago · c10e6bcb43
parent d47de79372
commit c10e6bcb43
2 changed files with 1 additions and 1 deletions
--- 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
--- a/libavcodec/nvenc_a.c
+++ b/libavcodec/nvenc_a.c