[FFmpeg-cvslog] Merge commit '6f40181cad8ac04adff7bd10e1e1ab65f22bc1f0'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 12 13:13:05 2017 +0100| [e514309a916e295c5b49c6c83e93ffc15a12317d] | committer: Clément Bœsch

Merge commit '6f40181cad8ac04adff7bd10e1e1ab65f22bc1f0'

* commit '6f40181cad8ac04adff7bd10e1e1ab65f22bc1f0':
  avconv_qsv: align the surface size to 32

This commit is a noop, see 03cef34aa66

Merged-by: Clément Bœsch <u at pkh.me>

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