RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/tests/ref/lavf-fate/mp3

4 lines
151 B
Plaintext
Raw Normal View History

Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9' * commit 'ef363ebd596da18f889a7d4845023a23dfac84c9': mp3enc: write full LAME frame Conflicts: libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24 12:48:12 +00:00
f231c5316357fd747573cbcb02f889c5 *./tests/data/lavf-fate/lavf.mp3
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>
2014-08-25 10:27:19 +00:00
96016 ./tests/data/lavf-fate/lavf.mp3
Do not decode the mp3 data in lavf test since that is not bit-exact. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-04-07 14:33:43 +00:00
./tests/data/lavf-fate/lavf.mp3 CRC=0x6c9850fe