avcodec/cuvid: rename cuvid.c to cuviddec.c
authorwm4 <nfxjfg@googlemail.com>
Tue, 3 Oct 2017 13:15:16 +0000 (15:15 +0200)
committerTimo Rothenpieler <timo@rothenpieler.org>
Fri, 10 Nov 2017 21:48:34 +0000 (22:48 +0100)
commit5593049466bcd1d3f1ddbfe580be4f36123d7c3d
treedf1963b08ca097b4a5c06c8f30523b2f9acf4935
parenteb7a01d692684b3d7008506aaedfcdd79193bde6
avcodec/cuvid: rename cuvid.c to cuviddec.c

cuvid.c is used by Libav's CUVID hwaccel. Resolve the conflict and
avoid future merge problems by renaming our decoder.

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
libavcodec/Makefile
libavcodec/cuviddec.c [moved from libavcodec/cuvid.c with 100% similarity]