diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 14:53:13 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 14:53:13 +0200 |
| commit | c734b34b044a182e10b4c2ad95a4f9f75aa1d64c (patch) | |
| tree | 9e93f7d150d28159edf7e8881aa6610a71d8c86e | |
| parent | 8998caf0a4d7e55f040c419f984be885ca0688db (diff) | |
| parent | b8b5d8274471129f122858bc74ad09284dae6ab7 (diff) | |
| download | ffmpeg-c734b34b044a182e10b4c2ad95a4f9f75aa1d64c.tar.gz | |
Merge commit 'b8b5d8274471129f122858bc74ad09284dae6ab7'
* commit 'b8b5d8274471129f122858bc74ad09284dae6ab7':
lavu: extend size of the AVPixFmtDescriptor.flags field
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavutil/pixdesc.h | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 1377fd0283..ca1419db14 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2015-xx-xx - lavu 55.0.100 / lavu 55.0.0 + xxxxxxx - Change type of AVPixFmtDescriptor.flags from uint8_t to uint64_t. + -------- 8< --------- FFmpeg 2.8 was cut here -------- 8< --------- 2015-08-27 - 1dd854e1 - lavc 56.58.100 - vaapi.h diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index b0b82852a7..426a8e13af 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -87,7 +87,11 @@ typedef struct AVPixFmtDescriptor { * This value only refers to the chroma components. */ uint8_t log2_chroma_h; - uint8_t flags; + + /** + * Combination of AV_PIX_FMT_FLAG_... flags. + */ + uint64_t flags; /** * Parameters that describe how pixels are packed. |