From 563a3972840885f26c96c3206df693534797ab2b Mon Sep 17 00:00:00 2001 From: olly Date: Thu, 23 Feb 2017 08:02:24 -0800 Subject: [PATCH] Merge remainder of https://github.com/google/ExoPlayer/pull/2372 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=148344124 --- demo/src/main/assets/media.exolist.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/demo/src/main/assets/media.exolist.json b/demo/src/main/assets/media.exolist.json index 6fba5bd65b..dd88f206c1 100644 --- a/demo/src/main/assets/media.exolist.json +++ b/demo/src/main/assets/media.exolist.json @@ -277,6 +277,18 @@ } ] }, + { + "name": "ClearKey DASH", + "samples": [ + { + "name": "Big Buck Bunny (CENC ClearKey)", + "uri": "http://html5.cablelabs.com:8100/cenc/ck/dash.mpd", + "extension": "mpd", + "drm_scheme": "cenc", + "drm_license_url": "https://wasabeef.jp/demos/cenc-ck-dash.json" + } + ] + }, { "name": "SmoothStreaming", "samples": [