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)
commitdd2f86864491e203b18889e3516807037e660ab1
treebd17884cdfb82c81a1759d3530da5cf118a9c04a
parent77eff7a58a436e4b1c1adb54a12dd4f3cead28d2
parentaae6b3b918b4133b8cc2d1631196c1d406d0351a
Merge commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a'

* commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a':
  movenc: Don't write any iso brands in ismv files

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