[FFmpeg-cvslog] Merge commit '6695f178a5929eab91d3da7e9023999f1774bd0e'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Feb 16 16:55:28 2016 +0000| [73bd20c4d238026937ff07713c035d3cfe66b151] | committer: Derek Buitenhuis

Merge commit '6695f178a5929eab91d3da7e9023999f1774bd0e'

* commit '6695f178a5929eab91d3da7e9023999f1774bd0e':
  pixdesc: Use AV_CEIL_RSHIFT in documentation

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

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