From 08d337365e11007f7a2edac4902f26737fdaeb66 Mon Sep 17 00:00:00 2001
From: Kelly Schrock <kellyschrock@gmail.com>
Date: Thu, 21 May 2015 20:35:09 -0500
Subject: [PATCH] HLS AAC fix

Fixes issue where an NPE occurs when RollingSampleBuffer is created
with a null Allocator.
---
 .../com/google/android/exoplayer/hls/HlsExtractorWrapper.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsExtractorWrapper.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsExtractorWrapper.java
index b189a12bd2..f6c784a5e3 100644
--- a/library/src/main/java/com/google/android/exoplayer/hls/HlsExtractorWrapper.java
+++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsExtractorWrapper.java
@@ -61,7 +61,6 @@ public final class HlsExtractorWrapper implements ExtractorOutput {
     this.extractor = extractor;
     this.shouldSpliceIn = shouldSpliceIn;
     sampleQueues = new SparseArray<DefaultTrackOutput>();
-    extractor.init(this);
   }
 
   /**
@@ -71,6 +70,7 @@ public final class HlsExtractorWrapper implements ExtractorOutput {
    */
   public void init(Allocator allocator) {
     this.allocator = allocator;
+    this.extractor.init(this);
   }
 
   /**