diff options
| author | James Almer <jamrial@gmail.com> | 2019-04-16 23:00:49 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-04-28 20:29:40 -0300 |
| commit | 45048ece81d395431d5604cf30596aaa62692da3 (patch) | |
| tree | 3fff8ae7f0af5535951d8dec8a65ac01cf06ab82 | |
| parent | 16c50abb5016fd260c3dcea21aeb335337fe5362 (diff) | |
| download | ffmpeg-45048ece81d395431d5604cf30596aaa62692da3.tar.gz | |
avcodec/cbs_h2645: use the fixed() macro for forbidden_zero_bit
This follows the spec definition, and removes a field from the relevant
structs.
Reviewed-by: Mark Thompson <sw@jkqxz.net>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/cbs_h264.h | 1 | ||||
| -rw-r--r-- | libavcodec/cbs_h264_syntax_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/cbs_h265.h | 1 | ||||
| -rw-r--r-- | libavcodec/cbs_h265_syntax_template.c | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/cbs_h264.h b/libavcodec/cbs_h264.h index b5eee7c370..cc46eeb3b0 100644 --- a/libavcodec/cbs_h264.h +++ b/libavcodec/cbs_h264.h @@ -38,7 +38,6 @@ enum { typedef struct H264RawNALUnitHeader { - uint8_t forbidden_zero_bit; uint8_t nal_ref_idc; uint8_t nal_unit_type; diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index cc9bd07590..95fc6d7194 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -33,7 +33,7 @@ static int FUNC(nal_unit_header)(CodedBitstreamContext *ctx, RWContext *rw, { int err; - u(1, forbidden_zero_bit, 0, 0); + fixed(1, forbidden_zero_bit, 0); ub(2, nal_ref_idc); ub(5, nal_unit_type); diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h index 0c0e4f84b0..c9bc90187b 100644 --- a/libavcodec/cbs_h265.h +++ b/libavcodec/cbs_h265.h @@ -35,7 +35,6 @@ enum { }; typedef struct H265RawNALUnitHeader { - uint8_t forbidden_zero_bit; uint8_t nal_unit_type; uint8_t nuh_layer_id; uint8_t nuh_temporal_id_plus1; diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 4402de355a..f279d283d9 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -33,7 +33,7 @@ static int FUNC(nal_unit_header)(CodedBitstreamContext *ctx, RWContext *rw, { int err; - u(1, forbidden_zero_bit, 0, 0); + fixed(1, forbidden_zero_bit, 0); if (expected_nal_unit_type >= 0) u(6, nal_unit_type, expected_nal_unit_type, |