Merge commit 'b8d5070db6313f985562865edcfd08a01c2d7503'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:27:41 +0000 (11:27 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:27:41 +0000 (11:27 +0100)
commit7b3a3e6276c42e6974cba2e9f36d140b8d760b0b
tree1ec0ae018a39e18c287fae84c8966d2e3c2a65db
parent76e21e83acbec89ee0278e310d98c4e53216c374
parentb8d5070db6313f985562865edcfd08a01c2d7503
Merge commit 'b8d5070db6313f985562865edcfd08a01c2d7503'

* commit 'b8d5070db6313f985562865edcfd08a01c2d7503':
  avcodec: Document AV_PKT_DATA_PALETTE side data type

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/avcodec.h