Merge commit 'c2c22c75cf89e2faab34d1ee1d392cfb065439ea'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Oct 2014 19:51:33 +0000 (21:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Oct 2014 20:03:51 +0000 (22:03 +0200)
* commit 'c2c22c75cf89e2faab34d1ee1d392cfb065439ea':
  movenc: Write tfdt atoms

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

Simple merge
index 5d99766,0000000..e79df0f
mode 100644,000000..100644
--- /dev/null
@@@ -1,1 -1,0 +1,1 @@@
- 3c685e807d4961924d0abcc18b3f8fa8
++f632afed498634a01b9c5ae5a2228012
index 2c8d92c,0000000..c54b857
mode 100644,000000..100644
--- /dev/null
@@@ -1,9 -1,0 +1,9 @@@
- 17b0b8eff852edd25fa38aed062689d7 *./tests/data/lavf/lavf.ismv
- 312546 ./tests/data/lavf/lavf.ismv
++564eaa3553ce02cf0921cd647fa4e6d2 *./tests/data/lavf/lavf.ismv
++312606 ./tests/data/lavf/lavf.ismv
 +./tests/data/lavf/lavf.ismv CRC=0xb7d29d29
- 543e5146df7bd4b7eb7edc94e0034ad9 *./tests/data/lavf/lavf.ismv
- 321452 ./tests/data/lavf/lavf.ismv
++53f0506abc827a6540a9faf5e3b761c0 *./tests/data/lavf/lavf.ismv
++321512 ./tests/data/lavf/lavf.ismv
 +./tests/data/lavf/lavf.ismv CRC=0x33834815
- 17b0b8eff852edd25fa38aed062689d7 *./tests/data/lavf/lavf.ismv
- 312546 ./tests/data/lavf/lavf.ismv
++564eaa3553ce02cf0921cd647fa4e6d2 *./tests/data/lavf/lavf.ismv
++312606 ./tests/data/lavf/lavf.ismv
 +./tests/data/lavf/lavf.ismv CRC=0xb7d29d29