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)
* commit 'b8d5070db6313f985562865edcfd08a01c2d7503':
  avcodec: Document AV_PKT_DATA_PALETTE side data type

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

Simple merge