diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsMasterPlaylistParser.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsMasterPlaylistParser.java
index 191ec06996..d0cb58baa9 100644
--- a/library/src/main/java/com/google/android/exoplayer/hls/HlsMasterPlaylistParser.java
+++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsMasterPlaylistParser.java
@@ -73,7 +73,7 @@ public final class HlsMasterPlaylistParser implements ManifestParser<HlsMasterPl
         String codecsString = HlsParserUtil.parseOptionalStringAttr(line, CODECS_ATTR_REGEX,
             CODECS_ATTR);
         if (codecsString != null) {
-          codecs = codecsString.split(",");
+          codecs = codecsString.split("(\\s*,\\s*)|(\\s*$)");
         } else {
           codecs = null;
         }