aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-media_base_media__switches.h
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-media_base_media__switches.h')
-rw-r--r--www/chromium/files/patch-media_base_media__switches.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h
index ad0568ac2cca..da7306901b73 100644
--- a/www/chromium/files/patch-media_base_media__switches.h
+++ b/www/chromium/files/patch-media_base_media__switches.h
@@ -1,15 +1,15 @@
---- media/base/media_switches.h.orig 2021-04-22 08:21:12 UTC
+--- media/base/media_switches.h.orig 2021-05-12 22:05:55 UTC
+++ media/base/media_switches.h
-@@ -183,10 +183,10 @@ MEDIA_EXPORT extern const base::Feature kUseR16Texture
+@@ -179,10 +179,10 @@ MEDIA_EXPORT extern const base::Feature kUseFakeDevice
+ MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore;
+ MEDIA_EXPORT extern const base::Feature kUseR16Texture;
MEDIA_EXPORT extern const base::Feature kUseSodaForLiveCaption;
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
--#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
MEDIA_EXPORT extern const base::Feature kVaapiVideoDecodeLinux;
MEDIA_EXPORT extern const base::Feature kVaapiVideoEncodeLinux;
--#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
MEDIA_EXPORT extern const base::Feature kVaapiAV1Decoder;
MEDIA_EXPORT extern const base::Feature kVaapiLowPowerEncoderGen9x;
MEDIA_EXPORT extern const base::Feature kVaapiEnforceVideoMinMaxResolution;