Merge commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 22:02:02 +0000 (23:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 22:02:02 +0000 (23:02 +0100)
commit4dc305d784ea01efd30871e9aa6625eff66e9e87
treed5e2bbc63303011c50463d11b8d40a331d6830a0
parent3fa4351d6bea1b07a3dd71e2f61cef2af5130a7c
parent40ed1cbf147d09fc0894bee160f0b6b6d9159fc5
Merge commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5'

* commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5':
  movenc: Allow writing a DASH sidx atom at the start of files

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c
libavformat/movenc.h