avformat/h264dec: Avoid get_ue_golomb_31( ) due to ff_ prefixed table from golomb.c
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 4 May 2016 20:43:01 +0000 (22:43 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 4 May 2016 20:43:01 +0000 (22:43 +0200)
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/h264dec.c

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