From: Clément Bœsch Date: Thu, 23 Mar 2017 10:27:41 +0000 (+0100) Subject: Merge commit 'b8d5070db6313f985562865edcfd08a01c2d7503' X-Git-Tag: n3.3~424 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=7b3a3e6276c42e6974cba2e9f36d140b8d760b0b;hp=76e21e83acbec89ee0278e310d98c4e53216c374 Merge commit 'b8d5070db6313f985562865edcfd08a01c2d7503' * commit 'b8d5070db6313f985562865edcfd08a01c2d7503': avcodec: Document AV_PKT_DATA_PALETTE side data type Merged-by: Clément Bœsch --- diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b3479a7223..73ed68da9f 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, /**