diff --git a/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java b/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java index 14980cf32..26d4c4e6a 100644 --- a/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java +++ b/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java @@ -49,11 +49,15 @@ public PropertyBoxParserImpl(String... customProperties) { try { mapping = new Properties(); try { - mapping.load(is); ClassLoader cl = Thread.currentThread().getContextClassLoader(); if (cl == null) { cl = ClassLoader.getSystemClassLoader(); } + if (is == null) { + is = cl.getResourceAsStream("isoparser2-default.properties"); + } + mapping.load(is); + Enumeration enumeration = cl.getResources("isoparser-custom.properties"); while (enumeration.hasMoreElements()) {