X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fpixdesc.h;h=ea84fd3c08288afc2cede6c37e605d99b3ac0811;hb=2268db2cd052674fde55c7d48b7a5098ce89b4ba;hp=bba7e05ca3c06825c044a6cdacdc62f3b7c3c35b;hpb=6b3ef7f080293956b2e5212b83135c6b051212e9;p=ffmpeg diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index bba7e05ca3c..ea84fd3c082 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -34,16 +34,16 @@ typedef struct AVComponentDescriptor { int plane; /** - * Number of elements between 2 horizontally consecutive pixels minus 1. + * Number of elements between 2 horizontally consecutive pixels. * Elements are bits for bitstream formats, bytes otherwise. */ - int step_minus1; + int step; /** - * Number of elements before the component of the first pixel plus 1. + * Number of elements before the component of the first pixel. * Elements are bits for bitstream formats, bytes otherwise. */ - int offset_plus1; + int offset; /** * Number of least significant bits that must be shifted away @@ -52,9 +52,20 @@ typedef struct AVComponentDescriptor { int shift; /** - * Number of bits in the component minus 1. + * Number of bits in the component. */ - int depth_minus1; + int depth; + +#if FF_API_PLUS1_MINUS1 + /** deprecated, use step instead */ + attribute_deprecated int step_minus1; + + /** deprecated, use depth instead */ + attribute_deprecated int depth_minus1; + + /** deprecated, use offset instead */ + attribute_deprecated int offset_plus1; +#endif } AVComponentDescriptor; /**