| Index: media/base/media.cc
|
| diff --git a/media/base/media.cc b/media/base/media.cc
|
| index 82cff856b7d2c03a3aade3075130f8918f42d626..e058b6a15dcf2ce3721f4bbd3778aacf520ce685 100644
|
| --- a/media/base/media.cc
|
| +++ b/media/base/media.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "media/base/media.h"
|
|
|
| +#include "base/allocator/features.h"
|
| #include "base/command_line.h"
|
| #include "base/macros.h"
|
| #include "base/metrics/field_trial.h"
|
| @@ -39,10 +40,10 @@ class MediaInitializer {
|
| // Disable logging as it interferes with layout tests.
|
| av_log_set_level(AV_LOG_QUIET);
|
|
|
| -#if defined(ALLOCATOR_SHIM)
|
| +#if BUILDFLAG(USE_ALLOCATOR_SHIM)
|
| // Remove allocation limit from ffmpeg, so calls go down to shim layer.
|
| av_max_alloc(0);
|
| -#endif // defined(ALLOCATOR_SHIM)
|
| +#endif // BUILDFLAG(USE_ALLOCATOR_SHIM)
|
|
|
| #endif // !defined(MEDIA_DISABLE_FFMPEG)
|
| }
|
|
|