| 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 4f5636fba3893f68193b5e15f02c357f50faef8a..c0b746d9758c6c814ff3d88c831706544a72685b 100644
|
| --- a/media/test/pipeline_integration_test_base.cc
|
| +++ b/media/test/pipeline_integration_test_base.cc
|
| @@ -56,7 +56,8 @@ static ScopedVector<VideoDecoder> CreateVideoDecodersForTest(
|
| #endif // !defined(MEDIA_DISABLE_LIBVPX)
|
|
|
| // Android does not have an ffmpeg video decoder.
|
| -#if !defined(MEDIA_DISABLE_FFMPEG) && !defined(OS_ANDROID)
|
| +#if !defined(MEDIA_DISABLE_FFMPEG) && !defined(OS_ANDROID) && \
|
| + !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
|
| video_decoders.push_back(new FFmpegVideoDecoder(media_log));
|
| #endif
|
| return video_decoders;
|
|
|