From 92e320812113825c6a33a6a1fd573599554b9e2d Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 8 Sep 2014 11:17:21 +0100
Subject: [PATCH] Don't try and read a trackEncryptionBox unless we actually
 have a saiz atom to parse.

Issue: #35
---
 .../android/exoplayer/parser/mp4/FragmentedMp4Extractor.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java b/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java
index 158c0be4ca..afe60c68c8 100644
--- a/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java
@@ -781,10 +781,10 @@ public final class FragmentedMp4Extractor {
     LeafAtom trun = traf.getLeafAtomOfType(Atom.TYPE_trun);
     parseTrun(track, fragmentHeader, decodeTime, workaroundFlags, trun.data, out);
 
-    TrackEncryptionBox trackEncryptionBox =
-        track.sampleDescriptionEncryptionBoxes[fragmentHeader.sampleDescriptionIndex];
     LeafAtom saiz = traf.getLeafAtomOfType(Atom.TYPE_saiz);
     if (saiz != null) {
+      TrackEncryptionBox trackEncryptionBox =
+          track.sampleDescriptionEncryptionBoxes[fragmentHeader.sampleDescriptionIndex];
       parseSaiz(trackEncryptionBox, saiz.data, out);
     }