Merge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 09:56:26 +0000 (11:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 10:06:15 +0000 (12:06 +0200)
commit04ee57ce0aba34722e47419fce5977f81ea09d07
tree09ae488114b194c24303a226c831fc0d2eb25206
parent018e0db5eff21d2b7e546bc63f4807dea782d00d
parentbb461370e34b1fa1637f34ce7d37b934ddb472d5
Merge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5'

* commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5':
  asfenc: mux chapters in ASF files using an ASF "marker" section

Conflicts:
Changelog
libavformat/version.h

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