Merge commit '6695f178a5929eab91d3da7e9023999f1774bd0e'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 16:55:28 +0000 (16:55 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 16:55:28 +0000 (16:55 +0000)
commit73bd20c4d238026937ff07713c035d3cfe66b151
tree59fc09c029351266f80726e0aecf7bba5853ff5d
parent3f462fcf76bb99bc2cb14575eaa7a020595ca277
parent6695f178a5929eab91d3da7e9023999f1774bd0e
Merge commit '6695f178a5929eab91d3da7e9023999f1774bd0e'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavutil/pixdesc.h