From 0e992370752e8570c330f70d83d5dd34a09e4228 Mon Sep 17 00:00:00 2001 From: zhihuichen Date: Tue, 24 Jan 2017 13:14:46 -0800 Subject: [PATCH] Allow duplicate tracks in WebM/MKV extractor ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=145457836 --- .../android/exoplayer2/extractor/mkv/MatroskaExtractor.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java index ccf78e6bc6..970335e9d2 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java @@ -529,11 +529,9 @@ public final class MatroskaExtractor implements Extractor { } break; case ID_TRACK_ENTRY: - if (tracks.get(currentTrack.number) == null && isCodecSupported(currentTrack.codecId)) { + if (isCodecSupported(currentTrack.codecId)) { currentTrack.initializeOutput(extractorOutput, currentTrack.number); tracks.put(currentTrack.number, currentTrack); - } else { - // We've seen this track entry before, or the codec is unsupported. Do nothing. } currentTrack = null; break;