From 6b3ef7f080293956b2e5212b83135c6b051212e9 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Wed, 2 Sep 2015 18:59:38 +0200 Subject: lavu: Remove bit packing from AVComponentDescriptor There is no practical benefit in having this structure elements bit packed given the size of the structure and its usage. Change types from uint16_t (packed) to plain int in order to simplify modifying the structure and accessing its fields. Signed-off-by: Vittorio Giovara --- libavutil/pixdesc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavutil') diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index c36f5d12f4..bba7e05ca3 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; /** -- cgit v1.2.3