From 2d31ae2921e5d6abfdc50d8731708d7cf0e7ff20 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Thu, 16 Aug 2012 00:20:48 +0200 Subject: [PATCH] lavf/segment: change default value for segment_list_size option, from 5 to 0 This is technically a major compatibility break, but seems the most natural default and what users would expect without reading the docs. --- doc/muxers.texi | 2 +- libavformat/segment.c | 2 +- libavformat/version.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 61e1c03dbc..2a191a6144 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -481,7 +481,7 @@ Generate also a listfile named @var{name}. If not specified no listfile is generated. @item segment_list_size @var{size} Overwrite the listfile once it reaches @var{size} entries. If 0 -the listfile is never overwritten. Default value is 5. +the listfile is never overwritten. Default value is 0. @item segment_list type @var{type} Specify the format for the segment list file. diff --git a/libavformat/segment.c b/libavformat/segment.c index bb92fc235d..db96a4104d 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -417,7 +417,7 @@ static int seg_write_trailer(struct AVFormatContext *s) static const AVOption options[] = { { "segment_format", "set container format used for the segments", OFFSET(format), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E }, { "segment_list", "set the segment list filename", OFFSET(list), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E }, - { "segment_list_size", "set the maximum number of playlist entries", OFFSET(list_size), AV_OPT_TYPE_INT, {.dbl = 5}, 0, INT_MAX, E }, + { "segment_list_size", "set the maximum number of playlist entries", OFFSET(list_size), AV_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, E }, { "segment_list_type", "set the segment list type", OFFSET(list_type), AV_OPT_TYPE_INT, {.dbl = LIST_TYPE_UNDEFINED}, -1, LIST_TYPE_NB-1, E, "list_type" }, { "flat", "flat format", 0, AV_OPT_TYPE_CONST, {.dbl=LIST_TYPE_FLAT }, INT_MIN, INT_MAX, 0, "list_type" }, { "ext", "extended format", 0, AV_OPT_TYPE_CONST, {.dbl=LIST_TYPE_EXT }, INT_MIN, INT_MAX, 0, "list_type" }, diff --git a/libavformat/version.h b/libavformat/version.h index ca0313586b..5a65c9433b 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MINOR 25 -#define LIBAVFORMAT_VERSION_MICRO 103 +#define LIBAVFORMAT_VERSION_MICRO 104 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \