Message ID | 20170706182842.7785-5-derek.buitenhuis@gmail.com |
---|---|
State | Superseded |
Headers | show |
On 7/6/17, Derek Buitenhuis <derek.buitenhuis@gmail.com> wrote: > Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> > --- > libavcodec/scpr.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c > index f6d1e45692..29ee70d521 100644 > --- a/libavcodec/scpr.c > +++ b/libavcodec/scpr.c > @@ -311,6 +311,8 @@ static int decompress_i(AVCodecContext *avctx, uint32_t > *dst, int linesize) > ret = decode_unit(s, &s->pixel_model[0][cx + cx1], 400, &r); > if (ret < 0) > return ret; > + if (ret < 0) > + return ret; Hmm?
On 7/6/2017 7:33 PM, Paul B Mahol wrote: >> + if (ret < 0) >> + return ret; > > Hmm? Seems I forgot to amend this one properly. v2 sent. - Derek
diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index f6d1e45692..29ee70d521 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -311,6 +311,8 @@ static int decompress_i(AVCodecContext *avctx, uint32_t *dst, int linesize) ret = decode_unit(s, &s->pixel_model[0][cx + cx1], 400, &r); if (ret < 0) return ret; + if (ret < 0) + return ret; cx1 = (cx << 6) & 0xFC0; cx = r >> cxshift;
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> --- libavcodec/scpr.c | 2 ++ 1 file changed, 2 insertions(+)