Merge ~b-stolk/chromium-browser/+git/snap-from-source:fix-non-intel-gpu into ~chromium-team/chromium-browser/+git/snap-from-source:hwacc-dev

[Bram Stolk]

The gpu memory flag still causes NV12 issues on non-intel gpus.
This means it breaks the webcam support.
The chromium launcher cannot enable that option.

diff --git a/launcher/chromium.launcher b/launcher/chromium.launcher
index 4c79460..53dfcea 100755
--- a/launcher/chromium.launcher
+++ b/launcher/chromium.launcher
@@ -113,8 +113,8 @@ fi
 # Add necessary flags for VAAPI video en/decoding
 CHROMIUM_VAAPI_FLAGS='--enable-features=VaapiVideoDecoder,VaapiVideoEncoder --disable-features=UseChromeOSDirectVideoDecoder --use-gl=egl --video-capture-use-external-dma-buffer'
 
-# With the patch for dynamic NV12 support detection, this should now be safe on non-Intel platforms.
-CHROMIUM_VAAPI_FLAGS="--video-capture-use-gpu-memory-buffer $CHROMIUM_VAAPI_FLAGS"
+# Still causes issues with PIXEL_FORMAT_NV12 on non-intel GPUs. We cannot enable this here.
+#CHROMIUM_VAAPI_FLAGS="--video-capture-use-gpu-memory-buffer $CHROMIUM_VAAPI_FLAGS"
 
 if [ -n "$WAYLAND_DISPLAY" ]; then
     CHROMIUM_VAAPI_FLAGS="--ozone-platform=wayland $CHROMIUM_VAAPI_FLAGS"