Merge commit 'd2e56cf753a6c462041dee897d9d0c90f349988c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:32:48 +0000 (22:32 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:32:48 +0000 (22:32 +0100)
* commit 'd2e56cf753a6c462041dee897d9d0c90f349988c':
  avconv: move flushing the queued frames to configure_filtergraph()

Noop, as its a fixup to a previously skipped commit

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge