sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix NPE if source is released having never been prepared.

Browse source
This commit is contained in:
Oliver Woodman 2015-05-01 20:11:27 +01:00
parent 837090e8f9
commit 88daaa882c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/src/main/java/com/google/android/exoplayer/FrameworkSampleSource.java
View file

@ -234,7 +234,7 @@ public final class FrameworkSampleSource implements SampleSource {
@Override @Override
public void release() { public void release() {
Assertions.checkState(remainingReleaseCount > 0); Assertions.checkState(remainingReleaseCount > 0);
if (--remainingReleaseCount == 0) { if (--remainingReleaseCount == 0 && extractor != null) {
extractor.release(); extractor.release();
extractor = null; extractor = null;
} }

2
library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java
View file

@ -313,7 +313,7 @@ public class ExtractorSampleSource implements SampleSource, ExtractorOutput, Loa
@Override @Override
public void release() { public void release() {
Assertions.checkState(remainingReleaseCount > 0); Assertions.checkState(remainingReleaseCount > 0);
if (--remainingReleaseCount == 0) { if (--remainingReleaseCount == 0 && loader != null) {
loader.release(); loader.release();
loader = null; loader = null;
} }