]> git.sesse.net Git - ffmpeg/commit
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)
commite514309a916e295c5b49c6c83e93ffc15a12317d
tree761e895d1d4cdb326bfc0b20a089a52847b04f94
parent993a9a3d72af4f4a07470570bc472a0d385ca78f
parent6f40181cad8ac04adff7bd10e1e1ab65f22bc1f0
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@pkh.me>