From a709db555d477ee6bd564bf1769b745a50c1a130 Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Thu, 7 Jun 2018 12:18:26 -0500 Subject: [PATCH] Add ffmpeg to the build instructions and licenses --- README.md | 2 +- dist.LICENSE.lin | 8 ++++++++ dist.LICENSE.osx | 8 ++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ecf4ab31..818aa875 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ obtain the various submodules that go into building Proton: cd proton #for linux: - git submodule update --init wine dxvk + git submodule update --init wine dxvk ffmpeg #for macos: git submodule update --init diff --git a/dist.LICENSE.lin b/dist.LICENSE.lin index 2aa793d7..aa51cfb6 100644 --- a/dist.LICENSE.lin +++ b/dist.LICENSE.lin @@ -59,3 +59,11 @@ Parts of this software are based on the OpenVR SDK, which is Visit OpenVR at https://github.com/ValveSoftware/openvr/ + +---- ---- ---- ---- + +This software contains FFmpeg licensed under the LGPL 2.1. + +Visit FFmpeg at + + https://ffmpeg.org/ diff --git a/dist.LICENSE.osx b/dist.LICENSE.osx index c0f97ff9..8283d194 100644 --- a/dist.LICENSE.osx +++ b/dist.LICENSE.osx @@ -88,3 +88,11 @@ Parts of this software are based on the OpenVR SDK, which is Visit OpenVR at https://github.com/ValveSoftware/openvr/ + +---- ---- ---- ---- + +This software contains FFmpeg licensed under the LGPL 2.1. + +Visit FFmpeg at + + https://ffmpeg.org/