diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-05 15:03:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-05 15:03:02 +0200 |
| commit | d19728da6f0048d4f6208a34c849aee61c8e2b2a (patch) | |
| tree | d21973d645c70667dca785e62d705a1aa6bcceed /libavformat/paf.c | |
| parent | 2e59210edfe822cce1369dd962d791cc9d45798b (diff) | |
| parent | 0edae4e6286096023cdd6adea74722fa06029867 (diff) | |
| download | ffmpeg-d19728da6f0048d4f6208a34c849aee61c8e2b2a.tar.gz | |
Merge commit '0edae4e6286096023cdd6adea74722fa06029867'
* commit '0edae4e6286096023cdd6adea74722fa06029867':
segment: Properly create new AVStreams for the chained muxer
segment: Add a missing space
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/paf.c')
0 files changed, 0 insertions, 0 deletions