| Index: media/test/pipeline_integration_test_base.cc
|
| diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc
|
| index 42e3511c142709c62da8dfb436d9333888dd5288..6d5398a4ff2ed1608d1f56b70d7b41116d9f5ae5 100644
|
| --- a/media/test/pipeline_integration_test_base.cc
|
| +++ b/media/test/pipeline_integration_test_base.cc
|
| @@ -285,7 +285,8 @@ std::unique_ptr<Renderer> PipelineIntegrationTestBase::CreateRenderer() {
|
| video_decoders.push_back(new VpxVideoDecoder());
|
| #endif // !defined(MEDIA_DISABLE_LIBVPX)
|
|
|
| -#if !defined(MEDIA_DISABLE_FFMPEG)
|
| +// Android does not have an ffmpeg video decoder.
|
| +#if !defined(MEDIA_DISABLE_FFMPEG) && !defined(OS_ANDROID)
|
| video_decoders.push_back(new FFmpegVideoDecoder());
|
| #endif
|
|
|
|
|