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)
* commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc':
  movenc: Place the sidx index after the initial moov/mdat pair

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

Simple merge