From 2a70a58f0ab7582f4bd32dd9ef50424deaa9f12d Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Sun, 31 Jul 2016 07:14:23 +0100
Subject: [PATCH] Fix non-DRM playback.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=128353039
---
 .../android/exoplayer2/video/MediaCodecVideoRenderer.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 251fef9b1a..f224eabc2c 100644
--- a/library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -176,10 +176,12 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     if (!MimeTypes.isVideo(mimeType)) {
       return FORMAT_UNSUPPORTED_TYPE;
     }
-    DrmInitData drmInitData = format.drmInitData;
     boolean requiresSecureDecryption = false;
-    for (int i = 0; i < drmInitData.schemeDataCount; i++) {
-      requiresSecureDecryption |= drmInitData.get(i).requiresSecureDecryption;
+    DrmInitData drmInitData = format.drmInitData;
+    if (drmInitData != null) {
+      for (int i = 0; i < drmInitData.schemeDataCount; i++) {
+        requiresSecureDecryption |= drmInitData.get(i).requiresSecureDecryption;
+      }
     }
     MediaCodecInfo decoderInfo = mediaCodecSelector.getDecoderInfo(mimeType,
         requiresSecureDecryption);