[FFmpeg-cvslog] Merge commit 'ac7bfd69678f3966e38debdb27f4bde94dc0345c'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Oct  1 15:19:18 2016 +0200| [62c58c59d54fda034ed7f7c16e3faa1bdaa1e16d] | committer: Hendrik Leppkes

Merge commit 'ac7bfd69678f3966e38debdb27f4bde94dc0345c'

* commit 'ac7bfd69678f3966e38debdb27f4bde94dc0345c':
  lavfi: add a QSV scaling filter

This is a noop since it depends on sharing a hwcontext with the
decoder/encoder, see 04b17ff and 130e1f1

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

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