diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-17 03:38:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-17 03:38:47 +0200 |
| commit | 52673ab18a8f241e37aea83236ffe0fa84b78655 (patch) | |
| tree | 64581b987853d985a747e0a1f0ec02f2b19ef9c0 /ffmpeg.c | |
| parent | 266172aaf968bb71713490cdc64ae4929ad08b8b (diff) | |
| parent | 13c99587511bfc35acf3b9427ef4d48ae5aec312 (diff) | |
| download | ffmpeg-52673ab18a8f241e37aea83236ffe0fa84b78655.tar.gz | |
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>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions