]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '6f40181cad8ac04adff7bd10e1e1ab65f22bc1f0'
authorClément Bœsch <u@pkh.me>
Sun, 12 Mar 2017 12:13:05 +0000 (13:13 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 12 Mar 2017 12:13:05 +0000 (13:13 +0100)
* commit '6f40181cad8ac04adff7bd10e1e1ab65f22bc1f0':
  avconv_qsv: align the surface size to 32

This commit is a noop, see 03cef34aa66

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

Trivial merge