Commit a7f7ed0c authored by Andrey Kosyakov's avatar Andrey Kosyakov Committed by Commit Bot

Fix build with media_use_ffmpeg = false

Originally broken by https://chromium-review.googlesource.com/c/chromium/src/+/2274584

Bug: 1094090
Change-Id: Icfd8b9be9acc7406ef63d88302986e9ac2d262cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2288387
Commit-Queue: Andrey Kosyakov <caseq@chromium.org>
Commit-Queue: Chrome Cunningham <chcunningham@chromium.org>
Reviewed-by: default avatarChrome Cunningham <chcunningham@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786496}
parent 8e5101bc
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
#include "media/base/encryption_scheme.h" #include "media/base/encryption_scheme.h"
#include "media/base/media_util.h" #include "media/base/media_util.h"
#include "media/base/waiting.h" #include "media/base/waiting.h"
#if BUILDFLAG(ENABLE_FFMPEG)
#include "media/filters/ffmpeg_audio_decoder.h" #include "media/filters/ffmpeg_audio_decoder.h"
#endif
#include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_init.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_init.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_chunk.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_chunk.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_config.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_config.h"
...@@ -25,8 +27,12 @@ namespace blink { ...@@ -25,8 +27,12 @@ namespace blink {
std::unique_ptr<AudioDecoderTraits::MediaDecoderType> std::unique_ptr<AudioDecoderTraits::MediaDecoderType>
AudioDecoderTraits::CreateDecoder(ExecutionContext& execution_context, AudioDecoderTraits::CreateDecoder(ExecutionContext& execution_context,
media::MediaLog* media_log) { media::MediaLog* media_log) {
#if BUILDFLAG(ENABLE_FFMPEG)
return std::make_unique<media::FFmpegAudioDecoder>( return std::make_unique<media::FFmpegAudioDecoder>(
execution_context.GetTaskRunner(TaskType::kInternalMedia), media_log); execution_context.GetTaskRunner(TaskType::kInternalMedia), media_log);
#else
return nullptr;
#endif
} }
// static // static
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment