Merge commit '1c169782cae6c5c430ff62e7d7272dc9d0e8d527'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 12:39:00 +0000 (14:39 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 12:39:00 +0000 (14:39 +0200)
commit82c4d57553d474505ae2df26503598b4e0303a80
treece0873e08f2711ffb69f139b2a0b702241b68ee7
parentadfcf16f76de675f1dd313bc64ec52f2e143732b
parent1c169782cae6c5c430ff62e7d7272dc9d0e8d527
Merge commit '1c169782cae6c5c430ff62e7d7272dc9d0e8d527'

* commit '1c169782cae6c5c430ff62e7d7272dc9d0e8d527':
  avconv: explicitly postpone writing the header until all streams are initialized

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