Merge pull request #1979 from vitekn/dev-v2

Fix NPE in TsExtractor when ElementaryStreamReaderFactory returns null

Merge pull request #1979 from vitekn/dev-v2
Fix NPE in TsExtractor when ElementaryStreamReaderFactory returns null
e4bafd96 · Santiago Seifert · GitHub · 924a0417 · b2222f8c · e4bafd96
Commit e4bafd96 authored Oct 21, 2016 by Santiago Seifert Committed by GitHub Oct 21, 2016
Showing with 2 additions and 0 deletions
library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
--- a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
+++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
@@ -467,8 +467,10 @@ public final class TsExtractor implements Extractor {
          pesPayloadReader = id3Reader;
        } else {
          pesPayloadReader = streamReaderFactory.createStreamReader(streamType, esInfo);
+          if (pesPayloadReader != null) {
            pesPayloadReader.init(output, new TrackIdGenerator(trackId, MAX_PID_PLUS_ONE));
          }
+        }
        if (pesPayloadReader != null) {
          tsPayloadReaders.put(elementaryPid, new PesReader(pesPayloadReader, timestampAdjuster));