videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avformat/evc: use get_ue_golomb_long() 

This partially reverts commit d0fc1b3507, which reintroduced a regression
originally fixed in 5e9986fd2d.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-06-27 12:52:38 -03:00
parent 285c7f6f6b
commit 6ff95758e6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/evc.c
View File

@ -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;