Commit 2c738c75 authored by Andreas Rheinhardt's avatar Andreas Rheinhardt

avformat/hlsenc: Always treat numbers as decimal

c801ab43 caused a regression: The stream
number is now parsed with strtoll without a fixed basis; as a
consequence, the "010" in a variant stream mapping like "a:010" is now
treated as an octal number (i.e. as eight, not ten). This was not
intended and may break some scripts, so this commit restores the old
behaviour.
Signed-off-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit 19a876fd6973724521dd5e7cc8f8e4683b19eda4)
parent 82d70d80
...@@ -1993,7 +1993,7 @@ static int parse_variant_stream_mapstring(AVFormatContext *s) ...@@ -1993,7 +1993,7 @@ static int parse_variant_stream_mapstring(AVFormatContext *s)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
num = strtoll(val, &end, 0); num = strtoll(val, &end, 10);
if (!av_isdigit(*val) || *end != '\0') { if (!av_isdigit(*val) || *end != '\0') {
av_log(s, AV_LOG_ERROR, "Invalid stream number: '%s'\n", val); av_log(s, AV_LOG_ERROR, "Invalid stream number: '%s'\n", val);
return AVERROR(EINVAL); return AVERROR(EINVAL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment