ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun 1 02:57:51 2015 +0200| [d0d0913702358c61dfb9c5ac8b141cd203524869] | committer: Michael Niedermayer
avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0d0913702358c61dfb9c5ac8b141cd203524869 --- libavcodec/Makefile | 2 +- libavcodec/{nvenc.c => nvenc_a.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index bfd6425..0931498 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.o +OBJS-$(CONFIG_NVENC) += nvenc_a.o OBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o OBJS-$(CONFIG_QPELDSP) += qpeldsp.o OBJS-$(CONFIG_QSV) += qsv.o diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc_a.c similarity index 100% rename from libavcodec/nvenc.c rename to libavcodec/nvenc_a.c _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
