virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/mobiclip: Use get_ue_golomb_31() where possible

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-11-05 22:03:57 +01:00
parent 96443ab4b0
commit 33996444ee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mobiclip.c
View File

@ -539,11 +539,11 @@ static int add_pframe_coefficients(AVCodecContext *avctx, AVFrame *frame,
{ {
MobiClipContext *s = avctx->priv_data; MobiClipContext *s = avctx->priv_data;
GetBitContext *gb = &s->gb; GetBitContext *gb = &s->gb;
int ret, idx = get_ue_golomb(gb); int ret, idx = get_ue_golomb_31(gb);
if (idx == 0) { if (idx == 0) {
ret = add_coefficients(avctx, frame, bx, by, size, plane); 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]; int flags = pframe_block4x4_coefficients_tab[idx];
for (int y = by; y < by + 8; y += 4) { 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); return predict_intra(avctx, frame, x, y, pmode, 0, 8, plane);
} }
tmp = get_ue_golomb(gb); tmp = get_ue_golomb_31(gb);
if (tmp < 0 || tmp > FF_ARRAY_ELEMS(block4x4_coefficients_tab)) if ((unsigned)tmp > FF_ARRAY_ELEMS(block4x4_coefficients_tab))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (tmp == 0) { if (tmp == 0) {