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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/key_systems.cc

Issue 1899423002: Revert of Implement support for vp9 in ISO-BMFF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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/base/eme_constants.h ('k') | media/base/mime_util_internal.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/key_systems.cc
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index 98b8b3fd4d5a162fe1fb13aef9456911cf5a3ea7..8a3ae69c8536ebe9669d975926218ab3f5019cfd 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -18,7 +18,6 @@
#include "media/base/media.h"
#include "media/base/media_client.h"
#include "media/cdm/key_system_names.h"
-#include "media/media_features.h"
#include "third_party/widevine/cdm/widevine_cdm_common.h"
namespace media {
@@ -55,9 +54,6 @@
{"vp9", EME_CODEC_WEBM_VP9}, // VP9.
{"vp9.0", EME_CODEC_WEBM_VP9}, // VP9.
#if defined(USE_PROPRIETARY_CODECS)
-#if BUILDFLAG(ENABLE_MP4_VP9_DEMUXING)
- {"vp09", EME_CODEC_MP4_VP9}, // VP9 in MP4.
-#endif
{"mp4a", EME_CODEC_MP4_AAC}, // AAC.
{"avc1", EME_CODEC_MP4_AVC1}, // AVC1.
{"avc3", EME_CODEC_MP4_AVC1} // AVC3.
« no previous file with comments | « media/base/eme_constants.h ('k') | media/base/mime_util_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698