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

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