[FFmpeg-cvslog] avformat/hlsenc: Always treat numbers as decimal

Andreas Rheinhardt git at videolan.org
Mon Jun 15 06:35:54 EEST 2020


ffmpeg | branch: release/4.3 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Mon Jun 15 05:09:07 2020 +0200| [2c738c75218a1dcaec3ec6baa9b0d4b267820812] | committer: Andreas Rheinhardt

avformat/hlsenc: Always treat numbers as decimal

c801ab43c36e8c4f88121aa09af26c77bcbd671b 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: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
(cherry picked from commit 19a876fd6973724521dd5e7cc8f8e4683b19eda4)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c738c75218a1dcaec3ec6baa9b0d4b267820812
---

 libavformat/hlsenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 18256cbf91..71fa3db060 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -1993,7 +1993,7 @@ static int parse_variant_stream_mapstring(AVFormatContext *s)
                 return AVERROR(EINVAL);
             }
 
-            num = strtoll(val, &end, 0);
+            num = strtoll(val, &end, 10);
             if (!av_isdigit(*val) || *end != '\0') {
                 av_log(s, AV_LOG_ERROR, "Invalid stream number: '%s'\n", val);
                 return AVERROR(EINVAL);



More information about the ffmpeg-cvslog mailing list