]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '66aa9b94dae217a0fc5acfb704490707629d95ed'
authorJames Almer <jamrial@gmail.com>
Tue, 31 Oct 2017 00:13:48 +0000 (21:13 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 31 Oct 2017 00:13:48 +0000 (21:13 -0300)
* commit '66aa9b94dae217a0fc5acfb704490707629d95ed':
  doc: Document hwupload, hwdownload and hwmap filters

This commit is a noop, see 5de38188f82ac21fc645009dbb6c593049eb773d

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge