| 
									
										
										
										
											2020-08-27 08:24:47 +00:00
										 |  |  | Index: chromium-85.0.4183.69/media/BUILD.gn
 | 
					
						
							| 
									
										
										
										
											2020-05-28 13:54:27 +00:00
										 |  |  | ===================================================================
 | 
					
						
							| 
									
										
										
										
											2020-08-27 08:24:47 +00:00
										 |  |  | --- 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") {
 | 
					
						
							| 
									
										
										
										
											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")
 | 
					
						
							|  |  |  | -}
 | 
					
						
							|  |  |  | -
 | 
					
						
							| 
									
										
										
										
											2017-10-19 03:26:36 +00:00
										 |  |  |  # 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. |