diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 14:53:34 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 14:53:34 +0200 |
| commit | f53569a93f853057d4852601b547a1d9c57613b6 (patch) | |
| tree | 8491cdda5b8afec5a9c7f9b655a157bddf0d7616 | |
| parent | c734b34b044a182e10b4c2ad95a4f9f75aa1d64c (diff) | |
| parent | 6b3ef7f080293956b2e5212b83135c6b051212e9 (diff) | |
| download | ffmpeg-f53569a93f853057d4852601b547a1d9c57613b6.tar.gz | |
Merge commit '6b3ef7f080293956b2e5212b83135c6b051212e9'
* commit '6b3ef7f080293956b2e5212b83135c6b051212e9':
lavu: Remove bit packing from AVComponentDescriptor
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | doc/APIchanges | 2 | ||||
| -rw-r--r-- | libavutil/pixdesc.h | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index ca1419db14..c91c97cc9b 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -17,6 +17,8 @@ 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. + xxxxxxx - Change type of AVComponentDescriptor fields from uint16_t to int + and drop bit packing. -------- 8< --------- FFmpeg 2.8 was cut here -------- 8< --------- diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index 426a8e13af..b92aa443c1 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -31,30 +31,30 @@ typedef struct AVComponentDescriptor { /** * Which of the 4 planes contains the component. */ - uint16_t plane : 2; + int plane; /** * Number of elements between 2 horizontally consecutive pixels minus 1. * Elements are bits for bitstream formats, bytes otherwise. */ - uint16_t step_minus1 : 3; + int step_minus1; /** * Number of elements before the component of the first pixel plus 1. * Elements are bits for bitstream formats, bytes otherwise. */ - uint16_t offset_plus1 : 3; + int offset_plus1; /** * Number of least significant bits that must be shifted away * to get the value. */ - uint16_t shift : 3; + int shift; /** * Number of bits in the component minus 1. */ - uint16_t depth_minus1 : 4; + int depth_minus1; } AVComponentDescriptor; /** |