Merge commit '2ded57371abead879bcee56da5131e5fac0d17ef'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 20:55:23 +0000 (21:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 20:55:23 +0000 (21:55 +0100)
commit9e0b0c60bd7fa4d4a476b93f94436a8e37d98983
treee0e8de2fab123d2e0c39f45ba42351442d1cc049
parent1fddfaa282ff63dba4170ced30f96dbb48bd0246
parent2ded57371abead879bcee56da5131e5fac0d17ef
Merge commit '2ded57371abead879bcee56da5131e5fac0d17ef'

* commit '2ded57371abead879bcee56da5131e5fac0d17ef':
  movenc: Add support for writing sidx atoms for DASH segments

Conflicts:
Changelog
libavformat/version.h

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