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
34dd4b14
authored
May 10, 2019
by
tonihei
Committed by
Oliver Woodman
May 15, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix NPE in HLS deriveAudioFormat.
Issue:#5868 PiperOrigin-RevId: 247613811
parent
95495328
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
RELEASENOTES.md
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
RELEASENOTES.md
View file @
34dd4b14
...
...
@@ -2,6 +2,8 @@
### dev-v2 (not yet released) ###
*
Fix NPE when using HLS chunkless preparation
(
[
#5868
](
https://github.com/google/ExoPlayer/issues/5868
)
).
*
Offline: Add option to remove all downloads.
*
Decoders:
*
Prefer codecs that advertise format support over ones that do not, even if
...
...
@@ -11,7 +13,7 @@
*
Audio: fix an issue where not all audio was played out when the configuration
for the underlying track was changing (e.g., at some period transitions).
*
UI: Change playback controls toggle from touch down to touch up events
(
[
#5784
](
https://github.com/google/ExoPlayer/issues/5784
)
).
(
[
#5784
](
https://github.com/google/ExoPlayer/issues/5784
)
).
### 2.10.0 ###
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
View file @
34dd4b14
...
...
@@ -802,7 +802,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
if
(
isPrimaryTrackInVariant
)
{
channelCount
=
variantFormat
.
channelCount
;
selectionFlags
=
variantFormat
.
selectionFlags
;
roleFlags
=
mediaTag
Format
.
roleFlags
;
roleFlags
=
variant
Format
.
roleFlags
;
language
=
variantFormat
.
language
;
label
=
variantFormat
.
label
;
}
...
...
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