mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-11 18:07:56 +02:00
Merge commit '6b3ef7f080293956b2e5212b83135c6b051212e9'
* commit '6b3ef7f080293956b2e5212b83135c6b051212e9': lavu: Remove bit packing from AVComponentDescriptor Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
f53569a93f
@ -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< ---------
|
||||
|
||||
|
@ -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;
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user