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 /tests/ref/lavf-fate | |
| 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 'tests/ref/lavf-fate')
| -rw-r--r-- | tests/ref/lavf-fate/mp3 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ref/lavf-fate/mp3 b/tests/ref/lavf-fate/mp3 index 6f201e00fe..ec6665261d 100644 --- a/tests/ref/lavf-fate/mp3 +++ b/tests/ref/lavf-fate/mp3 @@ -1,3 +1,3 @@ -6bdea919dc6856d76ef2553698e2b0d3 *./tests/data/lavf-fate/lavf.mp3 -96376 ./tests/data/lavf-fate/lavf.mp3 +8facd3cc6158b611cb312920a426cbd7 *./tests/data/lavf-fate/lavf.mp3 +96016 ./tests/data/lavf-fate/lavf.mp3 ./tests/data/lavf-fate/lavf.mp3 CRC=0x6c9850fe |