diff options
| author | Philip Langdale <philipl@overt.org> | 2015-06-06 10:42:00 -0700 |
|---|---|---|
| committer | Philip Langdale <philipl@overt.org> | 2015-06-06 13:14:07 -0700 |
| commit | c10e6bcb43ad5fca3f60b26ca035cfbfac42aaa4 (patch) | |
| tree | 62fdaeed2f7c457ca294e519b94f1fe16525eef3 | |
| parent | d47de79372d374ae106c65c3f313600c83e2afc8 (diff) | |
| download | ffmpeg-c10e6bcb43ad5fca3f60b26ca035cfbfac42aaa4.tar.gz | |
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@overt.org>
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/nvenc.c (renamed from libavcodec/nvenc_a.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0931498e32..bfd6425fd5 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 index 0a418a7a34..0a418a7a34 100644 --- a/libavcodec/nvenc_a.c +++ b/libavcodec/nvenc.c |