summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2010-04-14 18:47:37 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2010-04-14 18:47:37 +0000
commitcdb719b7e7f19f7408d5f05a42a3d2723a81d86e (patch)
tree8877fc9c8b393604b0601ca488ff10ffd5b8dc9b /www-client/chromium/files
parentStable for PPC (bug #305793). (diff)
downloadgentoo-2-cdb719b7e7f19f7408d5f05a42a3d2723a81d86e.tar.gz
gentoo-2-cdb719b7e7f19f7408d5f05a42a3d2723a81d86e.tar.bz2
gentoo-2-cdb719b7e7f19f7408d5f05a42a3d2723a81d86e.zip
Version bump for dev channel release. Add USE flags for mp3 and x264
support, depending on the system ffmpeg. (Portage version: 2.1.7.17/cvs/Linux i686)
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r--www-client/chromium/files/chromium-supported-media-mime-types.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-supported-media-mime-types.patch b/www-client/chromium/files/chromium-supported-media-mime-types.patch
new file mode 100644
index 000000000000..793de3d29847
--- /dev/null
+++ b/www-client/chromium/files/chromium-supported-media-mime-types.patch
@@ -0,0 +1,38 @@
+--- src/net/base/mime_util.cc.orig 2010-04-14 17:22:50.000000000 +0200
++++ src/net/base/mime_util.cc 2010-04-14 17:25:13.000000000 +0200
+@@ -189,18 +189,20 @@
+ "audio/ogg",
+ "application/ogg",
+
+-#if defined(GOOGLE_CHROME_BUILD)
++#if defined(GENTOO_CHROMIUM_H264_ENABLED)
+ // MPEG-4.
+ "video/mp4",
+ "video/x-m4v",
+ "audio/mp4",
+ "audio/x-m4a",
++#endif // defined(GENTOO_CHROMIUM_H264_ENABLED)
+
++#if defined(GENTOO_CHROMIUM_MP3_ENABLED)
+ // MP3.
+ "audio/mp3",
+ "audio/x-mp3",
+ "audio/mpeg",
+-#endif
++#endif // defined(GENTOO_CHROMIUM_MP3_ENABLED)
+ };
+
+ // List of supported codecs when passed in with <source type="...">.
+@@ -208,10 +210,10 @@
+ // 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)
++#if defined(GENTOO_CHROMIUM_H264_ENABLED)
+ "avc1",
+ "mp4a",
+-#endif
++#endif // defined(GENTOO_CHROMIUM_H264_ENABLED)
+ "theora",
+ "vorbis",
+ };