Merge remote-tracking branch 'luzero/segment'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Oct 2011 01:38:27 +0000 (03:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Oct 2011 01:38:47 +0000 (03:38 +0200)
commit52673ab18a8f241e37aea83236ffe0fa84b78655
tree64581b987853d985a747e0a1f0ec02f2b19ef9c0
parent266172aaf968bb71713490cdc64ae4929ad08b8b
parent13c99587511bfc35acf3b9427ef4d48ae5aec312
Merge remote-tracking branch 'luzero/segment'

* luzero/segment:
  segment: extend options
  segment: basic pattern support and playlist output
  segment: introduce segmented chain muxer
  output-example: extend duration
  ratecontrol: estimate twice the qscale values

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/examples/muxing.c
libavformat/Makefile
libavformat/allformats.c