[FFmpeg-devel,3/3] Revert "avformat: Add max_streams option"

Submitted by Nicolas George on Dec. 11, 2016, 4:40 p.m.

Details

Message ID 20161211164000.2858-3-george@nsup.org
State New
Headers show

Commit Message

Nicolas George Dec. 11, 2016, 4:40 p.m.
This reverts commit 1296f844955e513d19051c962656f829479d4fb9.

It was rushed and not properly designed.

Signed-off-by: Nicolas George <george@nsup.org>
---
 doc/formats.texi            | 4 ----
 libavformat/avformat.h      | 7 -------
 libavformat/options_table.h | 1 -
 libavformat/utils.c         | 2 +-
 libavformat/version.h       | 4 ++--
 5 files changed, 3 insertions(+), 15 deletions(-)

Patch hide | download patch | download mbox

diff --git a/doc/formats.texi b/doc/formats.texi
index c51d408..87704af 100644
--- a/doc/formats.texi
+++ b/doc/formats.texi
@@ -209,10 +209,6 @@  For example to separate the fields with newlines and indention:
 ffprobe -dump_separator "
                           "  -i ~/videos/matrixbench_mpeg2.mpg
 @end example
-
-@item max_streams @var{integer} (@emph{input})
-Specifies the maximum number of streams. This can be used to reject files that
-would require too many resources due to a large number of streams.
 @end table
 
 @c man end FORMAT OPTIONS
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index af257e4..adf08d7c 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1899,13 +1899,6 @@  typedef struct AVFormatContext {
      * - decoding: set by user through AVOptions (NO direct access)
      */
     char *protocol_blacklist;
-
-    /**
-     * The maximum number of streams.
-     * - encoding: unused
-     * - decoding: set by user through AVOptions (NO direct access)
-     */
-    int max_streams;
 } AVFormatContext;
 
 int av_format_get_probe_score(const AVFormatContext *s);
diff --git a/libavformat/options_table.h b/libavformat/options_table.h
index d5448e5..9d61d5a 100644
--- a/libavformat/options_table.h
+++ b/libavformat/options_table.h
@@ -105,7 +105,6 @@  static const AVOption avformat_options[] = {
 {"format_whitelist", "List of demuxers that are allowed to be used", OFFSET(format_whitelist), AV_OPT_TYPE_STRING, { .str = NULL },  CHAR_MIN, CHAR_MAX, D },
 {"protocol_whitelist", "List of protocols that are allowed to be used", OFFSET(protocol_whitelist), AV_OPT_TYPE_STRING, { .str = NULL },  CHAR_MIN, CHAR_MAX, D },
 {"protocol_blacklist", "List of protocols that are not allowed to be used", OFFSET(protocol_blacklist), AV_OPT_TYPE_STRING, { .str = NULL },  CHAR_MIN, CHAR_MAX, D },
-{"max_streams", "maximum number of streams", OFFSET(max_streams), AV_OPT_TYPE_INT, { .i64 = INT_MAX }, 0, INT_MAX, D },
 {NULL},
 };
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9e979a7..5f69b6b 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4217,7 +4217,7 @@  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 >= INT_MAX/sizeof(*streams))
         return NULL;
     streams = av_realloc_array(s->streams, s->nb_streams + 1, sizeof(*streams));
     if (!streams)
diff --git a/libavformat/version.h b/libavformat/version.h
index 192b790..a42d580 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -32,8 +32,8 @@ 
 // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
 // Also please add any ticket numbers that you believe might be affected here
 #define LIBAVFORMAT_VERSION_MAJOR  57
-#define LIBAVFORMAT_VERSION_MINOR  59
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MINOR  58
+#define LIBAVFORMAT_VERSION_MICRO 102
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \