Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
f69f9489
authored
Sep 01, 2015
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fixed issue in which ContainerMediaChunk would throw an NPE for self-initializing chunks.
parent
01a037f4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java
library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java
View file @
f69f9489
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment