Merge commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 06:50:22 +0000 (08:50 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 06:50:22 +0000 (08:50 +0200)
commit1907e19d0ce2ad752912d73b798ebf4494aa1b1c
tree7ce15d4eb18d5d382a065f3bd815d04f06897018
parent737aa902f069ed218fd2d13c59015391facf73c8
parent26ac22e5e7394346e9d59f800e7d4e91f4518d33
Merge commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33'

* commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33':
  movenc: Add a new flag for writing global sidx indexes for dash

Conflicts:
libavformat/movenc.c
libavformat/movenc.h

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