diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 03:13:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 03:13:16 +0100 |
| commit | f38e2bcb72ee2df60ce0fbeb2e33ce0ca8ebd7e8 (patch) | |
| tree | f5705f1f602bbd4ce4d8f0fc1d25e2da23c1bcda /libpostproc/postprocess_template.c | |
| parent | 504267fb56ba815ff896f9d5a7ce129a8ae674ab (diff) | |
| parent | 847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b (diff) | |
| download | ffmpeg-f38e2bcb72ee2df60ce0fbeb2e33ce0ca8ebd7e8.tar.gz | |
Merge commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b'
* commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b':
movenc: Add an option for delaying writing the moov with empty_moov
Conflicts:
libavformat/movenc.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc/postprocess_template.c')
0 files changed, 0 insertions, 0 deletions