[FFmpeg-cvslog] Merge commit 'd2e56cf753a6c462041dee897d9d0c90f349988c'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Nov 13 22:32:48 2016 +0100| [07dcef9bc7a614084f4afe39de678884a36cabf1] | committer: Hendrik Leppkes

Merge commit 'd2e56cf753a6c462041dee897d9d0c90f349988c'

* 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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07dcef9bc7a614084f4afe39de678884a36cabf1
---