Index: media/filters/decoder_selector.cc |
diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc |
index 3d6854f3c5149a08fd94319d31aa4c4be9f485ea..c4271060efc28567097de1866657f761c830bdb8 100644 |
--- a/media/filters/decoder_selector.cc |
+++ b/media/filters/decoder_selector.cc |
@@ -20,7 +20,7 @@ |
#include "media/filters/decoder_stream_traits.h" |
#include "media/filters/decrypting_demuxer_stream.h" |
-#if !defined(OS_ANDROID) |
+#if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
#include "media/filters/decrypting_audio_decoder.h" |
#include "media/filters/decrypting_video_decoder.h" |
#endif |
@@ -96,7 +96,7 @@ void DecoderSelector<StreamType>::SelectDecoder( |
// When there is a CDM attached, always try the decrypting decoder or |
// demuxer-stream first. |
if (cdm_context_) { |
-#if !defined(OS_ANDROID) |
+#if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
InitializeDecryptingDecoder(); |
#else |
InitializeDecryptingDemuxerStream(); |
@@ -112,7 +112,7 @@ void DecoderSelector<StreamType>::SelectDecoder( |
InitializeDecoder(); |
} |
-#if !defined(OS_ANDROID) |
+#if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
template <DemuxerStream::Type StreamType> |
void DecoderSelector<StreamType>::InitializeDecryptingDecoder() { |
DVLOG(2) << __func__; |
@@ -145,7 +145,7 @@ void DecoderSelector<StreamType>::DecryptingDecoderInitDone(bool success) { |
// DecryptingDemuxerStream to do decrypt-only. |
InitializeDecryptingDemuxerStream(); |
} |
-#endif // !defined(OS_ANDROID) |
+#endif // !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
template <DemuxerStream::Type StreamType> |
void DecoderSelector<StreamType>::InitializeDecryptingDemuxerStream() { |