diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-18 17:00:30 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-11 00:43:29 +0100 |
commit | b18a571e2355a6fb0dcb7ff7de18d36694eb65bd (patch) | |
tree | 3e9278a206c1c47fa86d19e9b4bd212f5073a6dd /libavformat/utils.c | |
parent | 0131f5c3769981c1e36ff124a50011702c491329 (diff) | |
download | ffmpeg-b18a571e2355a6fb0dcb7ff7de18d36694eb65bd.tar.gz |
avformat: Add max_streams option
This allows user apps to stop OOM due to excessive number of streams
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 1296f844955e513d19051c962656f829479d4fb9)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 7c53050f03..f1198c0079 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4087,7 +4087,7 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c) int i; AVStream **streams; - if (s->nb_streams >= INT_MAX/sizeof(*streams)) + if (s->nb_streams >= FFMIN(s->max_streams, INT_MAX/sizeof(*streams))) return NULL; streams = av_realloc_array(s->streams, s->nb_streams + 1, sizeof(*streams)); if (!streams) |