Merge commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 10 Aug 2015 09:24:30 +0000 (11:24 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 10 Aug 2015 09:24:30 +0000 (11:24 +0200)
commit10ea06b3bb863b8dca51f65c4b725eeba8557f12
tree8aa9253e5c8759200f42fefe8ba3afd511d67359
parent7653ebfff6ea3f91ea81599ba8e2af922c510ecb
parent5f200bbf98efe50f63d0515b115d2ba8dae297bc
Merge commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc'

* commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc':
  movenc: Place the sidx index after the initial moov/mdat pair

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/movenc.c