Merge branch 'dev' of https://github.com/google/ExoPlayer into dev

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);
   }
 
   /**