Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 8 Oct 2016 09:38:47 +0000 (11:38 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 8 Oct 2016 09:38:47 +0000 (11:38 +0200)
commit3e5e5bdfef07526aa5c6b15e0484bdc51289cad9
treef5c3754aa42bf8ca8d541fb771ca7644c89da3ad
parentc45ba265fcbb57fcacf82f66cb2a2643210308e1
parent398f015f077c6a2406deffd9e37ff34b9c7bb3bc
Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc'

* commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc':
  avconv: buffer the packets written while the muxer is not initialized

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
doc/ffmpeg.texi
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c