--- chromium-54.0.2840.16/media/BUILD.gn.proprietary-codecs 2016-09-09 00:02:27.000000000 +0200 +++ chromium-54.0.2840.16/media/BUILD.gn 2016-09-12 15:08:34.566096246 +0200 @@ -23,12 +23,6 @@ ] } -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. # NOT for exporting. config("media_config") {