[FFmpeg-cvslog] avcodec/mobiclip: Use get_ue_golomb_31() where possible

Andreas Rheinhardt git at videolan.org
Mon Nov 16 17:39:58 EET 2020


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Thu Nov  5 22:03:57 2020 +0100| [33996444ee5138f4dba74e26ede7fad5a9598c87] | committer: Andreas Rheinhardt

avcodec/mobiclip: Use get_ue_golomb_31() where possible

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

 libavcodec/mobiclip.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c
index 9fa88e84a0..42d33cf6a5 100644
--- a/libavcodec/mobiclip.c
+++ b/libavcodec/mobiclip.c
@@ -539,11 +539,11 @@ static int add_pframe_coefficients(AVCodecContext *avctx, AVFrame *frame,
 {
     MobiClipContext *s = avctx->priv_data;
     GetBitContext *gb = &s->gb;
-    int ret, idx = get_ue_golomb(gb);
+    int ret, idx = get_ue_golomb_31(gb);
 
     if (idx == 0) {
         ret = add_coefficients(avctx, frame, bx, by, size, plane);
-    } else if (idx < FF_ARRAY_ELEMS(pframe_block4x4_coefficients_tab)) {
+    } else if ((unsigned)idx < FF_ARRAY_ELEMS(pframe_block4x4_coefficients_tab)) {
         int flags = pframe_block4x4_coefficients_tab[idx];
 
         for (int y = by; y < by + 8; y += 4) {
@@ -1012,8 +1012,8 @@ static int process_block(AVCodecContext *avctx, AVFrame *frame,
         return predict_intra(avctx, frame, x, y, pmode, 0, 8, plane);
     }
 
-    tmp = get_ue_golomb(gb);
-    if (tmp < 0 || tmp > FF_ARRAY_ELEMS(block4x4_coefficients_tab))
+    tmp = get_ue_golomb_31(gb);
+    if ((unsigned)tmp > FF_ARRAY_ELEMS(block4x4_coefficients_tab))
         return AVERROR_INVALIDDATA;
 
     if (tmp == 0) {



More information about the ffmpeg-cvslog mailing list