215db2935b
* commit 'b263f8ffe7':
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>
3 lines
151 B
Text
3 lines
151 B
Text
8facd3cc6158b611cb312920a426cbd7 *./tests/data/lavf-fate/lavf.mp3
|
|
96016 ./tests/data/lavf-fate/lavf.mp3
|
|
./tests/data/lavf-fate/lavf.mp3 CRC=0x6c9850fe
|