diff options
| author | tnut <thierryn1 at hispeed dot ch> | 2010-03-19 16:30:41 +0100 |
|---|---|---|
| committer | tnut <thierryn1 at hispeed dot ch> | 2010-03-19 16:30:41 +0100 |
| commit | cdf99d159bcb8a7738f7502c27988eb5aed334e4 (patch) | |
| tree | 2616c5e63e05f04cf8094d3609cbf999dc7b45ca /extra/google-chrome/ffmpeg_branding_mime.patch | |
| parent | dae47f51e22efedcf92aa871945c2720c3ab2b30 (diff) | |
| parent | 8833b950d05a6ae766be65426fd7a69181e470b0 (diff) | |
| download | nutyx-extra-cdf99d159bcb8a7738f7502c27988eb5aed334e4.tar.gz nutyx-extra-cdf99d159bcb8a7738f7502c27988eb5aed334e4.tar.bz2 nutyx-extra-cdf99d159bcb8a7738f7502c27988eb5aed334e4.tar.xz nutyx-extra-cdf99d159bcb8a7738f7502c27988eb5aed334e4.zip | |
Merge commit 'lesibel/master'
Diffstat (limited to 'extra/google-chrome/ffmpeg_branding_mime.patch')
| -rw-r--r-- | extra/google-chrome/ffmpeg_branding_mime.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/extra/google-chrome/ffmpeg_branding_mime.patch b/extra/google-chrome/ffmpeg_branding_mime.patch new file mode 100644 index 000000000..083026e76 --- /dev/null +++ b/extra/google-chrome/ffmpeg_branding_mime.patch @@ -0,0 +1,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", + }; |