diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-25 12:27:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-25 13:25:09 +0200 |
| commit | 215db2935b06c0e936dadce012a31de7da25ba97 (patch) | |
| tree | 6ba41973c6902ce6e18d9cfa31330ab5fa290da2 /libavformat/options_table.h | |
| parent | f1b04f803eafa17dbfa19977b1a76f412183478e (diff) | |
| parent | b263f8ffe7599d9cd27ec477a12700da8eb2790d (diff) | |
| download | ffmpeg-215db2935b06c0e936dadce012a31de7da25ba97.tar.gz | |
Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'
* commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d':
lavf: add AVFormatContext.max_ts_probe
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/utils.c
libavformat/version.h
lavf-fate/mp3 changes as the estimated input bitrate changes and that is
copied to the output
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 94cd65cb59..eb4115cd7b 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -94,6 +94,7 @@ static const AVOption avformat_options[] = { {"strict", "strictly conform to all the things in the spec no matter what the consequences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_STRICT }, INT_MIN, INT_MAX, D|E, "strict"}, {"normal", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_NORMAL }, INT_MIN, INT_MAX, D|E, "strict"}, {"experimental", "allow non-standardized experimental variants", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_EXPERIMENTAL }, INT_MIN, INT_MAX, D|E, "strict"}, +{"max_ts_probe", "maximum number of packets to read while waiting for the first timestamp", OFFSET(max_ts_probe), AV_OPT_TYPE_INT, { .i64 = 50 }, 0, INT_MAX, D }, {NULL}, }; |