diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 03:17:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 03:19:22 +0100 |
| commit | 3adb5f8d8b4006f4188c9c4d6f0925988fadc2f4 (patch) | |
| tree | 5fcd6d5b8350b26839ccea85b7c0db5178f8dcc2 /libavformat/options_table.h | |
| parent | 6a4cc50980783013b19bfb2edaaca14cc38d5c92 (diff) | |
| parent | d9ae1031f5edbd25c8526b4cb51aba66d3bee931 (diff) | |
Merge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'
* commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931':
lavf: improve handling of sparse streams when muxing
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/mux.c
libavformat/options_table.h
libavformat/version.h
See: 37ed5df5c5e06a55724fb9eb215da1594b648282
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/options_table.h')
| -rw-r--r-- | libavformat/options_table.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/options_table.h b/libavformat/options_table.h index b42a762738..ca30fd29e3 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -79,6 +79,7 @@ static const AVOption avformat_options[] = { {"flush_packets", "enable flushing of the I/O context after each packet", OFFSET(flush_packets), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, E}, {"metadata_header_padding", "set number of bytes to be written as padding in a metadata header", OFFSET(metadata_header_padding), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, E}, {"output_ts_offset", "set output timestamp offset", OFFSET(output_ts_offset), AV_OPT_TYPE_DURATION, {.i64 = 0}, -INT64_MAX, INT64_MAX, E}, +{"max_interleave_delta", "maximum buffering duration for interleaving", OFFSET(max_interleave_delta), AV_OPT_TYPE_INT64, { .i64 = 10000000 }, 0, INT64_MAX, E }, {NULL}, }; |