Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(369)

Unified Diff: media/test/pipeline_integration_test_base.cc

Issue 2848213003: Fix building FFMPEG into Android (Closed)
Patch Set: Make decrypting decoder non-Android again Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/decoder_selector.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « media/filters/decoder_selector.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698