loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1979 from vitekn/dev-v2

Browse Source 
Fix NPE in TsExtractor when ElementaryStreamReaderFactory returns null
This commit is contained in:
Santiago Seifert 2016-10-21 11:45:21 +01:00 committed by GitHub
commit e4bafd964d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
View File

@ -467,7 +467,9 @@ public final class TsExtractor implements Extractor {
pesPayloadReader = id3Reader; pesPayloadReader = id3Reader;
} else { } else {
pesPayloadReader = streamReaderFactory.createStreamReader(streamType, esInfo); pesPayloadReader = streamReaderFactory.createStreamReader(streamType, esInfo);
pesPayloadReader.init(output, new TrackIdGenerator(trackId, MAX_PID_PLUS_ONE)); if (pesPayloadReader != null) {
pesPayloadReader.init(output, new TrackIdGenerator(trackId, MAX_PID_PLUS_ONE));
}
} }
if (pesPayloadReader != null) { if (pesPayloadReader != null) {