Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1014)

Unified Diff: media/base/media_init.cc

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweaking our x86inc.asm Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/media_init.cc
diff --git a/media/base/media_init.cc b/media/base/media_init.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c7d01f6bae99ec6d31c5470862b906c719aeae80
--- /dev/null
+++ b/media/base/media_init.cc
@@ -0,0 +1,22 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "media/base/media.h"
+#include "media/ffmpeg/ffmpeg_common.h"
+
+namespace media {
+namespace internal {
+
+void InitializeMediaLibraryInternal() {
+ // Disable logging as it interferes with layout tests.
+ av_log_set_level(AV_LOG_QUIET);
+
+#if defined(ALLOCATOR_SHIM)
+ // Remove allocation limit from ffmpeg, so calls go down to shim layer.
+ av_max_alloc(0);
+#endif
+}
+
+} // namespace internal
+} // namespace media

Powered by Google App Engine
This is Rietveld 408576698