diff --git a/ChangeLog b/ChangeLog index 46184bd95..3ebfc099b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-03-16 Moritz Bunkus + + * mkvmerge: enhancement: The SRT reader allows "." as the decimal + separator as well as ",". + 2007-03-12 Moritz Bunkus * mkvmerge: bug fix: Fixed a problem with concatenating more than diff --git a/src/input/r_srt.cpp b/src/input/r_srt.cpp index 26dee373b..73a533e6a 100644 --- a/src/input/r_srt.cpp +++ b/src/input/r_srt.cpp @@ -27,7 +27,7 @@ using namespace std; -#define RE_TIMECODE "(\\d{1,2}):(\\d{1,2}):(\\d{1,2}),(\\d+)?" +#define RE_TIMECODE "(\\d{1,2}):(\\d{1,2}):(\\d{1,2})[,\\.](\\d+)?" #define RE_TIMECODE_LINE "^" RE_TIMECODE "\\s+-+>\\s+" RE_TIMECODE "\\s*" int