Merge branch 'dev' of https://github.com/google/ExoPlayer into dev
This commit is contained in:
commit
a60dc5803e
@ -61,7 +61,6 @@ public final class HlsExtractorWrapper implements ExtractorOutput {
|
|||||||
this.extractor = extractor;
|
this.extractor = extractor;
|
||||||
this.shouldSpliceIn = shouldSpliceIn;
|
this.shouldSpliceIn = shouldSpliceIn;
|
||||||
sampleQueues = new SparseArray<DefaultTrackOutput>();
|
sampleQueues = new SparseArray<DefaultTrackOutput>();
|
||||||
extractor.init(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -71,6 +70,7 @@ public final class HlsExtractorWrapper implements ExtractorOutput {
|
|||||||
*/
|
*/
|
||||||
public void init(Allocator allocator) {
|
public void init(Allocator allocator) {
|
||||||
this.allocator = allocator;
|
this.allocator = allocator;
|
||||||
|
this.extractor.init(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user