[FFmpeg-cvslog] avformat/h264dec: Avoid get_ue_golomb_31( ) due to ff_ prefixed table from golomb.c

Michael Niedermayer git at videolan.org
Wed May 4 23:18:06 CEST 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed May  4 22:43:01 2016 +0200| [03e8c1b84398349a65f90cf7052cedad0f7acb5a] | committer: Michael Niedermayer

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

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03e8c1b84398349a65f90cf7052cedad0f7acb5a
---

 libavformat/h264dec.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/h264dec.c b/libavformat/h264dec.c
index 14d6e88..85d7163 100644
--- a/libavformat/h264dec.c
+++ b/libavformat/h264dec.c
@@ -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])



More information about the ffmpeg-cvslog mailing list