diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-10 20:15:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-08 20:32:01 +0100 |
| commit | 3d9c007b6116df30bfa179ae8e9fa54e4b9db2d0 (patch) | |
| tree | 540d624fd330e2091b498647e9628c22e521cca9 /libavformat | |
| parent | 5b8ee8f0134c48ff3b09bf4e0e35819c4435541d (diff) | |
| download | ffmpeg-3d9c007b6116df30bfa179ae8e9fa54e4b9db2d0.tar.gz | |
avformat/utils: Print verbose error message if stream count exceeds max_streams
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit f0bdd538712d8ed34120ab2b7bd1409fcc99fb45)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index f1198c0079..17bbdb44be 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4087,8 +4087,11 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c) int i; AVStream **streams; - if (s->nb_streams >= FFMIN(s->max_streams, INT_MAX/sizeof(*streams))) + if (s->nb_streams >= FFMIN(s->max_streams, INT_MAX/sizeof(*streams))) { + if (s->max_streams < INT_MAX/sizeof(*streams)) + av_log(s, AV_LOG_ERROR, "Number of streams exceeds max_streams parameter (%d), see the documentation if you wish to increase it\n", s->max_streams); return NULL; + } streams = av_realloc_array(s->streams, s->nb_streams + 1, sizeof(*streams)); if (!streams) return NULL; |