Merge commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae'
authorTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 04:28:13 +0000 (21:28 -0700)
committerTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 04:28:43 +0000 (21:28 -0700)
commite5c79cd854922693c80155a1744c9e93f54bce02
tree6010737c7f99db866703a24a27914b03fd12df4f
parent1b04ea1a6c237a94f81d1b8f8a42fae46fbeacab
parent5e1840622ce6e41c57d9c407604863d3f3dcc3ae
Merge commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae'

* commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae':
  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 843be56ee18928ecf80bcb20d235c4f9cab5a8fd.

Merged-by: Timothy Gu <timothygu99@gmail.com>
ffmpeg.c