diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 02:57:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 02:57:51 +0200 |
| commit | d0d0913702358c61dfb9c5ac8b141cd203524869 (patch) | |
| tree | 22fd2b498ac267c3ffb4abd9da1f5ebe087042a8 /libavcodec | |
| parent | 211dcdca5cd98173b76ea219a119c412b6ba8635 (diff) | |
| download | ffmpeg-d0d0913702358c61dfb9c5ac8b141cd203524869.tar.gz | |
avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/nvenc_a.c (renamed from libavcodec/nvenc.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index bfd6425fd5..0931498e32 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 index 0a418a7a34..0a418a7a34 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc_a.c |