File chromium-prop-codecs.patch of Package chromium.14883

Overview Repositories Revisions Requests Users Attributes Meta

File chromium-prop-codecs.patch of Package chromium.14883

Index: chromium-85.0.4183.69/media/BUILD.gn
===================================================================
--- chromium-85.0.4183.69.orig/media/BUILD.gn
+++ chromium-85.0.4183.69/media/BUILD.gn
@@ -44,12 +44,6 @@ buildflag_header("media_buildflags") {
   ]
 }
 
-if (proprietary_codecs && media_use_ffmpeg) {
-  assert(
-      ffmpeg_branding != "Chromium",
-      "proprietary codecs and ffmpeg_branding set to Chromium are incompatible")
-}
-
 # Common configuration for targets in the media directory; these must not be
 # exported since things like USE_NEON and USE_CRAS have different meanings
 # elsewhere in the code base.
Index: chromium-85.0.4183.69/third_party/webrtc/webrtc.gni
===================================================================
--- chromium-85.0.4183.69.orig/third_party/webrtc/webrtc.gni
+++ chromium-85.0.4183.69/third_party/webrtc/webrtc.gni
@@ -156,8 +156,7 @@ declare_args() {
   #
   # Enabling H264 when building with MSVC is currently not supported, see
   # bugs.webrtc.org/9213#c13 for more info.
-  rtc_use_h264 =
-      proprietary_codecs && !is_android && !is_ios && !(is_win && !is_clang)
+  rtc_use_h264 = false
 
   # Enable this flag to make webrtc::Mutex be implemented by absl::Mutex.
   rtc_use_absl_mutex = false

Places

File chromium-prop-codecs.patch of Package chromium.14883

Places