2016-11-07 20:04:46 +00:00
|
|
|
reverted:
|
2017-01-31 14:05:05 +00:00
|
|
|
Index: chromium-56.0.2914.3/media/BUILD.gn
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-56.0.2914.3.orig/media/BUILD.gn
|
|
|
|
|
+++ chromium-56.0.2914.3/media/BUILD.gn
|
|
|
|
|
@@ -25,12 +24,6 @@ buildflag_header("media_features") {
|
2016-11-07 20:04:46 +00:00
|
|
|
]
|
2011-08-17 07:21:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-if (proprietary_codecs && media_use_ffmpeg) {
|
|
|
|
|
- assert(
|
|
|
|
|
- ffmpeg_branding != "Chromium",
|
|
|
|
|
- "proprietary codecs and ffmpeg_branding set to Chromium are incompatible")
|
|
|
|
|
-}
|
|
|
|
|
-
|
2016-11-07 20:04:46 +00:00
|
|
|
# Common configuration for targets in the media directory.
|
|
|
|
|
# NOT for exporting.
|
|
|
|
|
config("media_config") {
|
