diff options
author | wm4 <nfxjfg@googlemail.com> | 2017-10-03 15:15:16 +0200 |
---|---|---|
committer | Timo Rothenpieler <timo@rothenpieler.org> | 2017-11-10 22:48:34 +0100 |
commit | 5593049466bcd1d3f1ddbfe580be4f36123d7c3d (patch) | |
tree | df1963b08ca097b4a5c06c8f30523b2f9acf4935 /fftools | |
parent | eb7a01d692684b3d7008506aaedfcdd79193bde6 (diff) | |
download | ffmpeg-5593049466bcd1d3f1ddbfe580be4f36123d7c3d.tar.gz |
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>
Diffstat (limited to 'fftools')
0 files changed, 0 insertions, 0 deletions