On Tue, 3 Oct 2017 15:15:16 +0200
wm4 wrote:
> cuvid.c is used by Libav's CUVID hwaccel. Resolve the conflict and
> avoid future merge problems by renaming our decoder.
> ---
> libavcodec/Makefile| 10 +-
> libavcodec/{cuvid.c => cuviddec.c} | 0
> 2 files changed, 5 in
LGTM
smime.p7s
Description: S/MIME Cryptographic Signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
cuvid.c is used by Libav's CUVID hwaccel. Resolve the conflict and
avoid future merge problems by renaming our decoder.
---
libavcodec/Makefile| 10 +-
libavcodec/{cuvid.c => cuviddec.c} | 0
2 files changed, 5 insertions(+), 5 deletions(-)
rename libavcodec/{cuvid.c => c
