diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-05 16:14:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-05 16:21:16 +0200 |
| commit | 50c555e3966371f3db6ab4aeb19404094e351e4e (patch) | |
| tree | bdb0552505b40737aedda69045782243c9bade35 /tools/bisect-create | |
| parent | 008d36ba1de3aa0e55b0e6c8298b11be6c6bef1f (diff) | |
| parent | 378a6315b7c48195ffd94e6aa9aa6d663d42b35e (diff) | |
| download | ffmpeg-50c555e3966371f3db6ab4aeb19404094e351e4e.tar.gz | |
Merge commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e'
* commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e':
segment: Add an option for disabling writing of a header/trailer to each segment
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/bisect-create')
0 files changed, 0 insertions, 0 deletions