Resolve merge conflicts

README.md

@@ -38,6 +38,10 @@ This is for wlroots based compositores, such as Sway
 ```
 sudo apt install libwayland-dev
 ```
+#### Warning:
+You might require ffmpeg version >= 4.3. Check the troubleshooting section for more information.
+
+### Compilation:
 
 #### Cuda + NvFBC
 This requires proprietary software
@@ -96,6 +100,9 @@ It's necessary to allow Sunshine to use KMS
 - If you get "Error: Failed to create client: Daemon not running", ensure that your avahi-daemon is running:
 	- `systemctl status avahi-daemon`
 
+- If you use hardware acceleration on Linux using an Intel or an AMD GPU (with VAAPI), you will get tons of [graphical issues](https://github.com/loki-47-6F-64/sunshine/issues/228) if your ffmpeg version is < 4.3. If it is not available in your distribution's repositories, consider using a newer version of your distribution.
+	- Ubuntu started to ship ffmpeg 4.3 starting with groovy (20.10). If you're using an older version, you could use [this PPA](https://launchpad.net/%7Esavoury1/+archive/ubuntu/ffmpeg4) instead of upgrading. **Using PPAs is dangerous and may break your system. Use it at your own risk.**
+
 ## Windows 10
 
 ### Requirements:

assets/sunshine.conf

@@ -140,7 +140,7 @@
 # You can find the name of the audio sink using the following command:
 # !! Linux only !!
 # pacmd list-sinks | grep "name:" if running vanilla pulseaudio
-# pactl info | grep Source` if running pipewire
+# pPipewire: Use `pactl info | grep Source`. In some causes you'd need to use the `sink` device. Try `pactl info | grep Sink`, if _Source_ doesn't work
 # audio_sink = alsa_output.pci-0000_09_00.3.analog-stereo
 #
 # !! Windows only !!