[FFmpeg-devel] [PATCH 5/5] Revert "avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation"

[James Almer]

On 06/06/15 2:51 PM, Philip Langdale wrote:
> This reverts commit d0d0913702358c61dfb9c5ac8b141cd203524869.
> 
> Signed-off-by: Philip Langdale <philipl at overt.org>
> ---
>  libavcodec/Makefile  |    2 +-
>  libavcodec/nvenc.c   | 1452 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  libavcodec/nvenc_a.c | 1452 --------------------------------------------------
>  3 files changed, 1453 insertions(+), 1453 deletions(-)
>  create mode 100644 libavcodec/nvenc.c
>  delete mode 100644 libavcodec/nvenc_a.c

Next time run git format-patch with -M so it can detect name changes :P