summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDale Curtis <dalecurtis@chromium.org>2015-06-17 16:01:21 -0700
committerDale Curtis <dalecurtis@chromium.org>2015-06-17 23:03:04 +0000
commitab31fe6077d2ba3ede9a302d9ef4554363c9a939 (patch)
tree24edd38a611a335d620b20a4de87ccdabd1e6c50 /tools
parent56cc9bd9cd4b010789298c8200170b06dd599c54 (diff)
downloadchromium_src-ab31fe6077d2ba3ede9a302d9ef4554363c9a939.zip
chromium_src-ab31fe6077d2ba3ede9a302d9ef4554363c9a939.tar.gz
chromium_src-ab31fe6077d2ba3ede9a302d9ef4554363c9a939.tar.bz2
[Merge to M44] Chromium changes to statically link ffmpeg.
Motivations: 1. Eliminates a large number of windows crashes hit while loading the DLL (see bugs) 2. Reducing the size of binary (about 400KB on linux, about 265KB on 32bit windows) due to dead-code elimination 3. Simplifying media library initialization (Remove bool-ness, it just works) Licensing: We've audited all the licenses for the files we actually use and have the green light from legal as long as we include the license text in the credits. TBR=thomasvl@chromium.org, dalecurtis@chromium.org, enne@chromium.org, grt@chromium.org, gunsch@chromium.org, isherman@chromium.org, jamiewalch@chromium.org, jochen@chromium.org, maruel@chromium.org, mmoss@google.com, phajdan.jr@chromium.org, sergeyu@chromium.org, sky@chromium.org BUG=435455, 429131, 441908 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Original Review URL: https://codereview.chromium.org/1141703002 (cherry picked from commit fd11b3c3aa6730ae1f024811b61913cd63f9d39a - refs/heads/master@{#333423}) Review URL: https://codereview.chromium.org/1179953006. Cr-Commit-Position: refs/branch-heads/2403@{#342} Cr-Branched-From: f54b8097a9c45ed4ad308133d49f05325d6c5070-refs/heads/master@{#330231}
Diffstat (limited to 'tools')
-rw-r--r--tools/metrics/histograms/histograms.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 79ec1d1..d611857 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -15150,6 +15150,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
</histogram>
<histogram name="Media.Initialize.Windows" units="GetLastError">
+ <obsolete>
+ Deprecated 05/2015 in Issue 1141703002. FFmpeg is now statically linked.
+ </obsolete>
<owner>scherkus@chromium.org</owner>
<summary>
Errors returned by LoadLibraryEx on Windows while attempting to load