Initial support for the desktop media pipeline on Android.

media/renderers/default_renderer_factory.cc

Index: media/renderers/default_renderer_factory.cc
diff --git a/media/renderers/default_renderer_factory.cc b/media/renderers/default_renderer_factory.cc
index c7c8340560889d23a96bfeddf78e66651472a81e..5bd50121e74a82ca1f0db54419edd2b08ae47a4c 100644
--- a/media/renderers/default_renderer_factory.cc
+++ b/media/renderers/default_renderer_factory.cc
@@ -16,10 +16,12 @@
 
 #if !defined(MEDIA_DISABLE_FFMPEG)
 #include "media/filters/ffmpeg_audio_decoder.h"
+#if !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
 #include "media/filters/ffmpeg_video_decoder.h"
 #endif
+#endif
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
 #include "media/filters/opus_audio_decoder.h"
 #endif
 
@@ -55,7 +57,7 @@ scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
       new FFmpegAudioDecoder(media_task_runner, media_log_));
 #endif
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
   audio_decoders.push_back(new OpusAudioDecoder(media_task_runner));
 #endif
 
@@ -79,7 +81,7 @@ scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
   video_decoders.push_back(new VpxVideoDecoder(media_task_runner));
 #endif
 
-#if !defined(MEDIA_DISABLE_FFMPEG)
+#if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
   video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner));
 #endif