Merge commit 'b8b5d8274471129f122858bc74ad09284dae6ab7'

* commit 'b8b5d8274471129f122858bc74ad09284dae6ab7': lavu: extend size of the AVPixFmtDescriptor.flags field

Hendrik Leppkes committed 11 years ago

Commit c734b342 parents 8998caf b8b5d822 files · +8 −1Browse files

Unified · Split

2 files

doc/APIchanges +3 −0
libavutil/pixdesc.h +5 −1

doc/APIchanges+3−0

@@ -15,6 +15,9 @@ libavutil: 2015-08-28 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2015-xx-xx - lavu 55.0.100 / lavu 55.0.0
		19	xxxxxxx - Change type of AVPixFmtDescriptor.flags from uint8_t to uint64_t.
		20
18	-------- 8< --------- FFmpeg 2.8 was cut here -------- 8< ---------	21	-------- 8< --------- FFmpeg 2.8 was cut here -------- 8< ---------
19		22
20	2015-08-27 - 1dd854e1 - lavc 56.58.100 - vaapi.h	23	2015-08-27 - 1dd854e1 - lavc 56.58.100 - vaapi.h

libavutil/pixdesc.h+5−1

@@ -87,7 +87,11 @@ typedef struct AVPixFmtDescriptor { · 86 unmodified lines
87	* This value only refers to the chroma components.	87	* This value only refers to the chroma components.
88	*/	88	*/
89	uint8_t log2_chroma_h;	89	uint8_t log2_chroma_h;
90	uint8_t flags;	90
		91	/**
		92	* Combination of AV_PIX_FMT_FLAG_... flags.
		93	*/
		94	uint64_t flags;
91		95
92	/**	96	/**
93	* Parameters that describe how pixels are packed.	97	* Parameters that describe how pixels are packed.