Browse Source

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>
tags/n2.7
Philip Langdale 10 years ago
parent
commit
c10e6bcb43
2 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/Makefile
  2. +0
    -0
      libavcodec/nvenc.c

+ 1
- 1
libavcodec/Makefile View File

@@ -92,7 +92,7 @@ OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideodsp.o rl.o \
OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \
motion_est.o ratecontrol.o \ motion_est.o ratecontrol.o \
mpegvideoencdsp.o mpegvideoencdsp.o
OBJS-$(CONFIG_NVENC) += nvenc_a.o
OBJS-$(CONFIG_NVENC) += nvenc.o
OBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o OBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o
OBJS-$(CONFIG_QPELDSP) += qpeldsp.o OBJS-$(CONFIG_QPELDSP) += qpeldsp.o
OBJS-$(CONFIG_QSV) += qsv.o OBJS-$(CONFIG_QSV) += qsv.o


libavcodec/nvenc_a.c → libavcodec/nvenc.c View File


Loading…
Cancel
Save