Merge commit '91622f6446b463abe6507ad2cd5d1fbf7e49c424'
authorJames Almer <jamrial@gmail.com>
Tue, 31 Oct 2017 16:41:37 +0000 (13:41 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 31 Oct 2017 16:41:37 +0000 (13:41 -0300)
commit88c7aa13dd30bcbdacdb416cef80811dc83fce23
treec856ba97a1237ce77f6528f177cf20986ecf37f6
parentdbde588917c3d74b0b3df937bcc80ada0296a3e4
parent91622f6446b463abe6507ad2cd5d1fbf7e49c424
Merge commit '91622f6446b463abe6507ad2cd5d1fbf7e49c424'

* commit '91622f6446b463abe6507ad2cd5d1fbf7e49c424':
  avconv: Always initialize the opkt struct on streamcopy

Merged-by: James Almer <jamrial@gmail.com>
fftools/ffmpeg.c