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/avformat.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/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f6fb5a36a5..b915148ad7 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1454,6 +1454,12 @@ typedef struct AVFormatContext { int event_flags; #define AVFMT_EVENT_FLAG_METADATA_UPDATED 0x0001 ///< The call resulted in updated metadata. + /** + * Maximum number of packets to read while waiting for the first timestamp. + * Decoding only. + */ + int max_ts_probe; + /** * Transport stream id. |