[FFmpeg-cvslog] Merge commit 'b8d5070db6313f985562865edcfd08a01c2d7503'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Mar 23 11:27:41 2017 +0100| [7b3a3e6276c42e6974cba2e9f36d140b8d760b0b] | committer: Clément Bœsch

Merge commit 'b8d5070db6313f985562865edcfd08a01c2d7503'

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

Merged-by: Clément Bœsch <u at pkh.me>

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

 libavcodec/avcodec.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b3479a7..73ed68d 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1395,6 +1395,11 @@ typedef struct AVCPBProperties {
  * @{
  */
 enum AVPacketSideDataType {
+    /**
+     * An AV_PKT_DATA_PALETTE side data packet contains exactly AVPALETTE_SIZE
+     * bytes worth of palette. This side data signals that a new palette is
+     * present.
+     */
     AV_PKT_DATA_PALETTE,
 
     /**


======================================================================