diff options
| author | James Almer <jamrial@gmail.com> | 2023-06-27 12:52:38 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2023-06-27 12:52:38 -0300 |
| commit | 6ff95758e6bf47004f69c56d7547a971c4782b21 (patch) | |
| tree | 959264e06ea3941c2888ee117029cff39ac99f96 /libavformat/evc.c | |
| parent | 285c7f6f6b3740725101e7d5cea94a47e2915298 (diff) | |
| download | ffmpeg-6ff95758e6bf47004f69c56d7547a971c4782b21.tar.gz | |
avformat/evc: use get_ue_golomb_long()
This partially reverts commit d0fc1b3507c, which reintroduced a regression
originally fixed in 5e9986fd2d.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/evc.c')
| -rw-r--r-- | libavformat/evc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/evc.c b/libavformat/evc.c index a4fa42d902..95f07266b0 100644 --- a/libavformat/evc.c +++ b/libavformat/evc.c @@ -93,7 +93,7 @@ static int evcc_parse_sps(const uint8_t *bs, int bs_size, EVCDecoderConfiguratio if (ret < 0) return ret; - sps_seq_parameter_set_id = get_ue_golomb_31(&gb); + sps_seq_parameter_set_id = get_ue_golomb_long(&gb); if (sps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) return AVERROR_INVALIDDATA; @@ -111,15 +111,15 @@ static int evcc_parse_sps(const uint8_t *bs, int bs_size, EVCDecoderConfiguratio // 1 - 4:2:0 // 2 - 4:2:2 // 3 - 4:4:4 - evcc->chroma_format_idc = get_ue_golomb_31(&gb); + evcc->chroma_format_idc = get_ue_golomb_long(&gb); if (evcc->chroma_format_idc > 3) return AVERROR_INVALIDDATA; evcc->pic_width_in_luma_samples = get_ue_golomb_long(&gb); evcc->pic_height_in_luma_samples = get_ue_golomb_long(&gb); - evcc->bit_depth_luma_minus8 = get_ue_golomb_31(&gb); - evcc->bit_depth_chroma_minus8 = get_ue_golomb_31(&gb); + evcc->bit_depth_luma_minus8 = get_ue_golomb_long(&gb); + evcc->bit_depth_chroma_minus8 = get_ue_golomb_long(&gb); // EVCDecoderConfigurationRecord can't store values > 7. Limit it to bit depth 14. if (evcc->bit_depth_luma_minus8 > 6 || evcc->bit_depth_chroma_minus8 > 6) return AVERROR_INVALIDDATA; |