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

Unified Diff: content/browser/media/media_internals.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 | « no previous file | media/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/media_internals.cc
diff --git a/content/browser/media/media_internals.cc b/content/browser/media/media_internals.cc
index 29d14fdfbcb091fcd19271516b028551184e6160..a8086ef5b37eff998a3dd3047d4adc07a7b218a0 100644
--- a/content/browser/media/media_internals.cc
+++ b/content/browser/media/media_internals.cc
@@ -31,7 +31,7 @@
#include "media/base/media_log_event.h"
#include "media/filters/gpu_video_decoder.h"
-#if !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
+#if !defined(OS_ANDROID)
#include "media/filters/decrypting_video_decoder.h"
#endif
@@ -524,7 +524,7 @@ std::string MediaInternals::MediaInternalsUMAHandler::GetUMANameForAVStream(
return uma_name + "Other";
}
-#if !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
+#if !defined(OS_ANDROID)
if (player_info.video_decoder ==
media::DecryptingVideoDecoder::kDecoderName) {
return uma_name + "DVD";
« no previous file with comments | « no previous file | media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698