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

10 lines
420 B
Plaintext
Raw Normal View History

Merge commit '9257692ac15eff7b07540c1f61cebde0d8823fbd' * commit '9257692ac15eff7b07540c1f61cebde0d8823fbd': lavf: Only initialize s->offset once when using avoid_negative_ts make_zero Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-18 01:38:38 +00:00
a9ccbb4cd1436d222ef4425567b4e03d *./tests/data/lavf/lavf.ismv
Merge commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a' * commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a': movenc: Don't write any iso brands in ismv files Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-31 01:51:04 +00:00
312542 ./tests/data/lavf/lavf.ismv
Merge commit '9257692ac15eff7b07540c1f61cebde0d8823fbd' * commit '9257692ac15eff7b07540c1f61cebde0d8823fbd': lavf: Only initialize s->offset once when using avoid_negative_ts make_zero Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-18 01:38:38 +00:00
./tests/data/lavf/lavf.ismv CRC=0x9d9a638a
440d85f9fd5b9f63c2676638782b5c15 *./tests/data/lavf/lavf.ismv
Merge commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a' * commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a': movenc: Don't write any iso brands in ismv files Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-31 01:51:04 +00:00
321448 ./tests/data/lavf/lavf.ismv
Merge commit '9257692ac15eff7b07540c1f61cebde0d8823fbd' * commit '9257692ac15eff7b07540c1f61cebde0d8823fbd': lavf: Only initialize s->offset once when using avoid_negative_ts make_zero Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-18 01:38:38 +00:00
./tests/data/lavf/lavf.ismv CRC=0xe8130120
a9ccbb4cd1436d222ef4425567b4e03d *./tests/data/lavf/lavf.ismv
Merge commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a' * commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a': movenc: Don't write any iso brands in ismv files Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-31 01:51:04 +00:00
312542 ./tests/data/lavf/lavf.ismv
Merge commit '9257692ac15eff7b07540c1f61cebde0d8823fbd' * commit '9257692ac15eff7b07540c1f61cebde0d8823fbd': lavf: Only initialize s->offset once when using avoid_negative_ts make_zero Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-18 01:38:38 +00:00
./tests/data/lavf/lavf.ismv CRC=0x9d9a638a