Index: media/mojo/services/renderer_config_default.cc |
diff --git a/media/mojo/services/renderer_config_default.cc b/media/mojo/services/renderer_config_default.cc |
index 76da6db577025bdca91734d0e72c312438fd4d0b..66464a9a61ee6ad199ff1fc8c2107ac77af1c5bd 100644 |
--- a/media/mojo/services/renderer_config_default.cc |
+++ b/media/mojo/services/renderer_config_default.cc |
@@ -12,7 +12,7 @@ |
#include "media/base/media.h" |
#include "media/filters/opus_audio_decoder.h" |
-#if !defined(OS_ANDROID) |
+#if !defined(MEDIA_DISABLE_FFMPEG) |
#include "media/filters/ffmpeg_audio_decoder.h" |
#include "media/filters/ffmpeg_video_decoder.h" |
#endif |
@@ -55,7 +55,7 @@ class DefaultRendererConfig : public PlatformRendererConfig { |
const LogCB& media_log_cb) override { |
ScopedVector<AudioDecoder> audio_decoders; |
-#if !defined(OS_ANDROID) |
+#if !defined(MEDIA_DISABLE_FFMPEG) |
audio_decoders.push_back( |
new FFmpegAudioDecoder(media_task_runner, media_log_cb)); |
audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); |
@@ -74,9 +74,9 @@ class DefaultRendererConfig : public PlatformRendererConfig { |
#if !defined(MEDIA_DISABLE_LIBVPX) |
video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); |
-#endif // !defined(MEDIA_DISABLE_LIBVPX) |
+#endif |
-#if !defined(OS_ANDROID) |
+#if !defined(MEDIA_DISABLE_FFMPEG) |
video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); |
#endif |