virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/h264dec: Avoid get_ue_golomb_31( ) due to ff_ prefixed table from golomb.c

Browse Source 
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-05-04 22:43:01 +02:00
parent 824906a541
commit 03e8c1b843
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/h264dec.c
View File

@@ -70,7 +70,7 @@ static int h264_probe(AVProbeData *p)
case 1: case 1:
case 5: case 5:
get_ue_golomb_long(&gb); get_ue_golomb_long(&gb);
if (get_ue_golomb_31(&gb) > 9U) if (get_ue_golomb_long(&gb) > 9U)
return 0; return 0;
pps_id = get_ue_golomb_long(&gb); pps_id = get_ue_golomb_long(&gb);
if (pps_id > MAX_PPS_COUNT) if (pps_id > MAX_PPS_COUNT)
@@ -88,7 +88,7 @@ static int h264_probe(AVProbeData *p)
if (get_bits(&gb, 2)) if (get_bits(&gb, 2))
return 0; return 0;
skip_bits(&gb, 8); skip_bits(&gb, 8);
sps_id = get_ue_golomb_31(&gb); sps_id = get_ue_golomb_long(&gb);
if (sps_id > MAX_SPS_COUNT) if (sps_id > MAX_SPS_COUNT)
return 0; return 0;
sps_ids[sps_id] = 1; sps_ids[sps_id] = 1;
@@ -98,7 +98,7 @@ static int h264_probe(AVProbeData *p)
pps_id = get_ue_golomb_long(&gb); pps_id = get_ue_golomb_long(&gb);
if (pps_id > MAX_PPS_COUNT) if (pps_id > MAX_PPS_COUNT)
return 0; return 0;
sps_id = get_ue_golomb_31(&gb); sps_id = get_ue_golomb_long(&gb);
if (sps_id > MAX_SPS_COUNT) if (sps_id > MAX_SPS_COUNT)
return 0; return 0;
if (!sps_ids[sps_id]) if (!sps_ids[sps_id])