Merge commit '49a242687cf44f86570b706db3c5912ff06bc6c2'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 21:09:35 +0000 (23:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 21:13:31 +0000 (23:13 +0200)
commit1ebc77bc7d68748598878c08c85a571b526a729f
tree117f2f6b361c9b3649af288ce97047d3115b5fb4
parenteba453e03ffeec8bb79cdcf35698e0fa13cc6d6e
parent49a242687cf44f86570b706db3c5912ff06bc6c2
Merge commit '49a242687cf44f86570b706db3c5912ff06bc6c2'

* commit '49a242687cf44f86570b706db3c5912ff06bc6c2':
  doc: Document segment_list_type

Conflicts:
doc/muxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/muxers.texi