Merge commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Oct 2014 01:51:04 +0000 (02:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Oct 2014 01:52:43 +0000 (02:52 +0100)
* commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a':
  movenc: Don't write any iso brands in ismv files

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

Simple merge
index 2c8d92c,0000000..ab2975f
mode 100644,000000..100644
--- /dev/null
@@@ -1,9 -1,0 +1,9 @@@
- 17b0b8eff852edd25fa38aed062689d7 *./tests/data/lavf/lavf.ismv
- 312546 ./tests/data/lavf/lavf.ismv
++b1106bfcdbd1bb12be9161320351dd00 *./tests/data/lavf/lavf.ismv
++312542 ./tests/data/lavf/lavf.ismv
 +./tests/data/lavf/lavf.ismv CRC=0xb7d29d29
- 543e5146df7bd4b7eb7edc94e0034ad9 *./tests/data/lavf/lavf.ismv
- 321452 ./tests/data/lavf/lavf.ismv
++c8bea6c84b6274f14042381045b0f532 *./tests/data/lavf/lavf.ismv
++321448 ./tests/data/lavf/lavf.ismv
 +./tests/data/lavf/lavf.ismv CRC=0x33834815
- 17b0b8eff852edd25fa38aed062689d7 *./tests/data/lavf/lavf.ismv
- 312546 ./tests/data/lavf/lavf.ismv
++b1106bfcdbd1bb12be9161320351dd00 *./tests/data/lavf/lavf.ismv
++312542 ./tests/data/lavf/lavf.ismv
 +./tests/data/lavf/lavf.ismv CRC=0xb7d29d29