From e84bce61304dbfc639d2447deafbfcdcb37269b9 Mon Sep 17 00:00:00 2001 From: "J. Oliva" Date: Thu, 19 Feb 2015 01:17:35 +0100 Subject: [PATCH] Fixed issue in CODEC regular expression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previous regular expression for extracting codec information was wrong, given a line that defines a variant it added information from “CODEC=“ text to the end of the line (including also information about RESOLUTION or alternate rendition groups as part of the CODEC field). This is not causing a functional problem (at least known by me) although is making codecs field storing information that is not related with the codec. --- .../com/google/android/exoplayer/hls/HlsPlaylistParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java index a2497e3218..0205364718 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java +++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java @@ -60,7 +60,7 @@ public final class HlsPlaylistParser implements ManifestParser { private static final Pattern BANDWIDTH_ATTR_REGEX = Pattern.compile(BANDWIDTH_ATTR + "=(\\d+)\\b"); private static final Pattern CODECS_ATTR_REGEX = - Pattern.compile(CODECS_ATTR + "=\"(.+)\""); + Pattern.compile(CODECS_ATTR + "=\"(.+?)\""); private static final Pattern RESOLUTION_ATTR_REGEX = Pattern.compile(RESOLUTION_ATTR + "=(\\d+x\\d+)");