diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 13:37:16 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 13:37:16 +0200 |
commit | d68adbd666cbc1180380034324d86cb31f1f77ae (patch) | |
tree | 15d9f11e9e9f3fb6ec6c9a15a5d9848e379364ed /libavformat/rtp.h | |
parent | 221a99aae767961c7567dc222f74b778581c9458 (diff) | |
parent | f8ef91ff3d6bb83d601d816ef9368f911021c64b (diff) | |
download | ffmpeg-d68adbd666cbc1180380034324d86cb31f1f77ae.tar.gz |
Merge commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b'
* commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b':
movenc: add faststart option for web streaming
Conflicts:
doc/muxers.texi
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtp.h')
0 files changed, 0 insertions, 0 deletions