--- file_not_specified_in_diff +++ file_not_specified_in_diff @@ -, +, @@ --- /media/base/media.cc +++ /media/base/media.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include + #include "media/base/media.h" #include "base/allocator/buildflags.h" @@ -41,7 +43,7 @@ #if BUILDFLAG(USE_ALLOCATOR_SHIM) // Remove allocation limit from ffmpeg, so calls go down to shim layer. - av_max_alloc(0); + av_max_alloc(std::numeric_limits::max()); #endif // BUILDFLAG(USE_ALLOCATOR_SHIM) #endif // BUILDFLAG(ENABLE_FFMPEG) --- /third_party/ffmpeg/chromium/dllmain.cc +++ /third_party/ffmpeg/chromium/dllmain.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include +#include #include #include #include @@ -28,7 +29,7 @@ if (reason == DLL_PROCESS_ATTACH) { DisableThreadLibraryCalls(instance); // Remove allocation limit from ffmpeg, so calls go down to shim layer. - av_max_alloc(0); + av_max_alloc(std::numeric_limits::max()); // Enable OOM crashes in the shim for all malloc calls that fail. _set_new_mode(1); _set_new_handler(&OnNoMemory);