Merge commit 'c55d1d382cd41345a79782ace41f9b43f45dca9a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Oct 2014 01:31:59 +0000 (02:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Oct 2014 01:37:49 +0000 (02:37 +0100)
* commit 'c55d1d382cd41345a79782ace41f9b43f45dca9a':
  movenc: Don't write any tfdt atom for ismv files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/movenc.c
tests/ref/lavf/ismv

Simple merge
index c87cf6e,0000000..2c8d92c
mode 100644,000000..100644
--- /dev/null
@@@ -1,9 -1,0 +1,9 @@@
- 56193aebd2845871f4e91956b3e4dea5 *./tests/data/lavf/lavf.ismv
- 312610 ./tests/data/lavf/lavf.ismv
++17b0b8eff852edd25fa38aed062689d7 *./tests/data/lavf/lavf.ismv
++312546 ./tests/data/lavf/lavf.ismv
 +./tests/data/lavf/lavf.ismv CRC=0xb7d29d29
- 19c7e128c52d7a1d7a1921d60774a785 *./tests/data/lavf/lavf.ismv
- 321516 ./tests/data/lavf/lavf.ismv
++543e5146df7bd4b7eb7edc94e0034ad9 *./tests/data/lavf/lavf.ismv
++321452 ./tests/data/lavf/lavf.ismv
 +./tests/data/lavf/lavf.ismv CRC=0x33834815
- 56193aebd2845871f4e91956b3e4dea5 *./tests/data/lavf/lavf.ismv
- 312610 ./tests/data/lavf/lavf.ismv
++17b0b8eff852edd25fa38aed062689d7 *./tests/data/lavf/lavf.ismv
++312546 ./tests/data/lavf/lavf.ismv
 +./tests/data/lavf/lavf.ismv CRC=0xb7d29d29