| Message ID | 20200904194905.6269-1-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Commit | c1a5d06b8245b92277e6537fe70bfe6f4f31b302 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avcodec/mobiclip: Fix mixed declarations and code | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On 9/4/20, Andreas Rheinhardt <andreas.rheinhardt@gmail.com> wrote: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > libavcodec/mobiclip.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > ok > diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c > index e2bda76978..d147eddbae 100644 > --- a/libavcodec/mobiclip.c > +++ b/libavcodec/mobiclip.c > @@ -1333,13 +1333,15 @@ static int mobiclip_decode(AVCodecContext *avctx, > void *data, > setup_qtables(avctx, s->quantizer + get_se_golomb(gb)); > for (int y = 0; y < avctx->height; y += 16) { > for (int x = 0; x < avctx->width; x += 16) { > + int idx; > + > motion[0].x = mid_pred(motion[x / 16 + 1].x, motion[x / 16 > + 2].x, motion[x / 16 + 3].x); > motion[0].y = mid_pred(motion[x / 16 + 1].y, motion[x / 16 > + 2].y, motion[x / 16 + 3].y); > motion[x / 16 + 2].x = 0; > motion[x / 16 + 2].y = 0; > > - int idx = get_vlc2(gb, s->mv_vlc[s->moflex][0].table, > - s->mv_vlc[s->moflex][0].bits, 1); > + idx = get_vlc2(gb, s->mv_vlc[s->moflex][0].table, > + s->mv_vlc[s->moflex][0].bits, 1); > if (idx < 0) > return AVERROR_INVALIDDATA; > > -- > 2.20.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index e2bda76978..d147eddbae 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -1333,13 +1333,15 @@ static int mobiclip_decode(AVCodecContext *avctx, void *data, setup_qtables(avctx, s->quantizer + get_se_golomb(gb)); for (int y = 0; y < avctx->height; y += 16) { for (int x = 0; x < avctx->width; x += 16) { + int idx; + motion[0].x = mid_pred(motion[x / 16 + 1].x, motion[x / 16 + 2].x, motion[x / 16 + 3].x); motion[0].y = mid_pred(motion[x / 16 + 1].y, motion[x / 16 + 2].y, motion[x / 16 + 3].y); motion[x / 16 + 2].x = 0; motion[x / 16 + 2].y = 0; - int idx = get_vlc2(gb, s->mv_vlc[s->moflex][0].table, - s->mv_vlc[s->moflex][0].bits, 1); + idx = get_vlc2(gb, s->mv_vlc[s->moflex][0].table, + s->mv_vlc[s->moflex][0].bits, 1); if (idx < 0) return AVERROR_INVALIDDATA;
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavcodec/mobiclip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)