summaryrefslogtreecommitdiffstats
path: root/extra/chromium/ffmpeg_branding_mime.patch
blob: 083026e76af5b5aff92bc249a697b9030f848b6c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
--- src/net/base/mime_util.cc	2010-02-11 20:07:33.939537145 +0100
+++ src/net/base/mime_util.cc	2010-02-11 20:07:33.955373468 +0100
@@ -188,7 +188,6 @@
   "audio/ogg",
   "application/ogg",
 
-#if defined(GOOGLE_CHROME_BUILD)
   // MPEG-4.
   "video/mp4",
   "video/x-m4v",
@@ -199,7 +198,6 @@
   "audio/mp3",
   "audio/x-mp3",
   "audio/mpeg",
-#endif
 };
 
 // List of supported codecs when passed in with <source type="...">.
@@ -207,10 +205,8 @@
 // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support
 // for more information.
 static const char* const supported_media_codecs[] = {
-#if defined(GOOGLE_CHROME_BUILD)
   "avc1",
   "mp4a",
-#endif
   "theora",
   "vorbis",
 };