Merge commit 'b8d5070db6313f985562865edcfd08a01c2d7503'

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

Clément Bœsch committed 9 years ago

Commit 7b3a3e62 parents 76e21e8 b8d50701 file · +5 −0Browse files

Unified · Split

@@ -1395,6 +1395,11 @@ typedef struct AVCPBProperties { · 1394 unmodified lines
1395	1395	* @{
1396	1396	*/
1397	1397	enum AVPacketSideDataType {
	1398	+ /**
	1399	+ * An AV_PKT_DATA_PALETTE side data packet contains exactly AVPALETTE_SIZE
	1400	+ * bytes worth of palette. This side data signals that a new palette is
	1401	+ * present.
	1402	+ */
1398	1403	AV_PKT_DATA_PALETTE,
1399	1404
1400	1405	/**

Keyboard shortcuts