diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:45:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:46:55 +0100 |
| commit | 89a9c84ebb1292a631b0895b80cddb9d0ba8ad0f (patch) | |
| tree | c95592e71cc3abce710bb1a9ed58fe8711e2a343 /README | |
| parent | 0adde39e048868e1b3e2f7c94c4d47f45f5438f9 (diff) | |
| parent | 1c1e252cd1cbd5f59fe118c49f6d7207dbdfdbd4 (diff) | |
| download | ffmpeg-89a9c84ebb1292a631b0895b80cddb9d0ba8ad0f.tar.gz | |
Merge commit '1c1e252cd1cbd5f59fe118c49f6d7207dbdfdbd4' into release/2.2
* commit '1c1e252cd1cbd5f59fe118c49f6d7207dbdfdbd4':
movenc: Add a fallback fragmentation method for plain mp4 as well
Conflicts:
libavformat/movenc.c
See: ef1aae6ea9aae9a523b6dcd8e670dbca823a88f8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions