Merge commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Aug 2013 11:37:16 +0000 (13:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Aug 2013 11:37:16 +0000 (13:37 +0200)
commitd68adbd666cbc1180380034324d86cb31f1f77ae
tree15d9f11e9e9f3fb6ec6c9a15a5d9848e379364ed
parent221a99aae767961c7567dc222f74b778581c9458
parentf8ef91ff3d6bb83d601d816ef9368f911021c64b
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>
doc/muxers.texi
libavformat/movenc.c
libavformat/movenc.h