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 /doc | |
| parent | f1b04f803eafa17dbfa19977b1a76f412183478e (diff) | |
| parent | b263f8ffe7599d9cd27ec477a12700da8eb2790d (diff) | |
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 'doc')
| -rw-r--r-- | doc/APIchanges | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index de4040db8f..58be3cb9b8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2014-08-09 API changes, most recent first: +2014-08-xx - xxxxxxx - lavf 56.03.0 - avformat.h + Add AVFormatContext.max_ts_probe. + 2014-08-23 - xxxxxxx - lavu 54.7.100 - dict.h AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL arguments are now freed even on error. This is consistent with the behaviour all users |