merged upstream/dev

This commit is contained in:
Ritvik Saraf 2019-01-29 22:32:58 +05:30
commit 77c6d3d576
119 changed files with 2960 additions and 1715 deletions

View file

@ -36,7 +36,6 @@ public class SecondaryStreamHelper<T extends Stream> {
* @return selected audio stream or null if a candidate was not found
*/
public static AudioStream getAudioStreamFor(@NonNull List<AudioStream> audioStreams, @NonNull VideoStream videoStream) {
// TODO: check if m4v and m4a selected streams are DASH compliant
switch (videoStream.getFormat()) {
case WEBM:
case MPEG_4: