]> git.sesse.net Git - ffmpeg/commit
Merge commit '4709f72115e4028a1cb43e916925678bfceef870'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 17:00:37 +0000 (17:00 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 17:00:52 +0000 (17:00 +0000)
commit4401f07f4daac9167dfffc9080c3a978dd36534b
treec2bc06ad239da9be808bf59efb300615a5422e63
parent56475e885ba748e984fb46030f44850348c83fff
parent4709f72115e4028a1cb43e916925678bfceef870
Merge commit '4709f72115e4028a1cb43e916925678bfceef870'

This commit is a no-op.

* commit '4709f72115e4028a1cb43e916925678bfceef870':
  lavfi: Use AV_CEIL_RSHIFT where needed

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>