Commit f69f9489 by Oliver Woodman

Fixed issue in which ContainerMediaChunk would throw an NPE for self-initializing chunks.

parent 01a037f4
...@@ -163,7 +163,8 @@ public class ContainerMediaChunk extends BaseMediaChunk implements SingleTrackOu ...@@ -163,7 +163,8 @@ public class ContainerMediaChunk extends BaseMediaChunk implements SingleTrackOu
// Private methods. // Private methods.
private static MediaFormat getAdjustedMediaFormat(MediaFormat format, long sampleOffsetUs) { private static MediaFormat getAdjustedMediaFormat(MediaFormat format, long sampleOffsetUs) {
if (sampleOffsetUs != 0 && format.subsampleOffsetUs != MediaFormat.OFFSET_SAMPLE_RELATIVE) { if (sampleOffsetUs != 0 && format != null
&& format.subsampleOffsetUs != MediaFormat.OFFSET_SAMPLE_RELATIVE) {
return format.copyWithSubsampleOffsetUs(format.subsampleOffsetUs + sampleOffsetUs); return format.copyWithSubsampleOffsetUs(format.subsampleOffsetUs + sampleOffsetUs);
} }
return format; return format;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment