Merge commit 'd336bfcf69fee159e9dba5e5e486ddb1aba61aab'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 16:59:06 +0000 (16:59 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 16:59:06 +0000 (16:59 +0000)
commit74f5cb0189d61affc6550723c1f82d4ae76df1d5
treed576518c7a688bbe128a8474fe290c14fec0eee9
parent27acb64a53375e1253b5a4c3299b04ade1dc1c1d
parentd336bfcf69fee159e9dba5e5e486ddb1aba61aab
Merge commit 'd336bfcf69fee159e9dba5e5e486ddb1aba61aab'

* commit 'd336bfcf69fee159e9dba5e5e486ddb1aba61aab':
  pixdesc: fix and extend doxy for av_pix_fmt_get_chroma_sub_sample()

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