diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 13:16:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 13:16:34 +0200 |
| commit | 6537827189153cd1c6944403a48d7ff76f7b8228 (patch) | |
| tree | e713d2f95acea7b929949d6836f037fc71e5a359 /ffmpeg.c | |
| parent | 2e0cc34292d25526f9b91752aa980fd740a0edf7 (diff) | |
| parent | e3b225a4fe0ff1e64a220b757c6f0a5cf9258521 (diff) | |
Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'
* commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521':
matroskaenc: add an option to put the index at the start of the file
Conflicts:
doc/muxers.texi
libavformat/matroskaenc.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions