* commit '5e184062':
  avconv: fix handling attachments in init_output_stream

Conflicts:
	avconv.c

This is functionally a no-op, as we don't have the bug this is trying to
fix. See 843be56e.
Merged-by: Timothy Gu <timothygu99@gmail.com>