Merge commit '6ed0f70f97c882813199b3bafd724ceeb43659de'
authorJames Almer <jamrial@gmail.com>
Wed, 28 Sep 2016 15:59:07 +0000 (12:59 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 28 Sep 2016 15:59:07 +0000 (12:59 -0300)
commit3597d32e88c8e0c6e6f25fe73a9ebd235c879c2b
tree9fa64c178882d5e166cad664f5461fbd56d2158a
parentdf2ae8f3f0a8ce9d9aefa5efb664928a783759ec
parent6ed0f70f97c882813199b3bafd724ceeb43659de
Merge commit '6ed0f70f97c882813199b3bafd724ceeb43659de'

* commit '6ed0f70f97c882813199b3bafd724ceeb43659de':
  avconv: factor out initializing stream parameters for streamcopy

Conflicts:
    ffmpeg.c

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