mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-slava86.git
synced 2025-02-24 16:02:56 +00:00
16 lines
705 B
Diff
16 lines
705 B
Diff
diff -up chromium-62.0.3192.0/media/BUILD.gn.proprietary-codecs chromium-62.0.3192.0/media/BUILD.gn
|
|
--- chromium-62.0.3192.0/media/BUILD.gn.proprietary-codecs 2017-08-30 16:13:04.296259457 +0200
|
|
+++ chromium-62.0.3192.0/media/BUILD.gn 2017-08-30 16:18:23.778444612 +0200
|
|
@@ -33,12 +33,6 @@ buildflag_header("media_features") {
|
|
]
|
|
}
|
|
|
|
-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.
|