| Message ID | 20161215202113.20807-4-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | c869e00f881019fa0eaf40874f92e2566b9a0410 |
| Headers | show |
On 12/15/16, Michael Niedermayer <michael@niedermayer.cc> wrote: > Most decoders return the amount of data used. > This is more consistent > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/smvjpegdec.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c > index e319e5781b..018e135b30 100644 > --- a/libavcodec/smvjpegdec.c > +++ b/libavcodec/smvjpegdec.c > @@ -200,9 +200,11 @@ static int smvjpeg_decode_frame(AVCodecContext *avctx, > void *data, int *data_siz > s->picture[1]->linesize[i] = mjpeg_data->linesize[i]; > > ret = av_frame_ref(data, s->picture[1]); > + if (ret < 0) > + return ret; > } > > - return ret; > + return avpkt->size; > } > > static const AVClass smvjpegdec_class = { > -- > 2.11.0 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > lgtm
On Thu, Dec 15, 2016 at 09:35:25PM +0100, Paul B Mahol wrote: > On 12/15/16, Michael Niedermayer <michael@niedermayer.cc> wrote: > > Most decoders return the amount of data used. > > This is more consistent > > > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/smvjpegdec.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c > > index e319e5781b..018e135b30 100644 > > --- a/libavcodec/smvjpegdec.c > > +++ b/libavcodec/smvjpegdec.c > > @@ -200,9 +200,11 @@ static int smvjpeg_decode_frame(AVCodecContext *avctx, > > void *data, int *data_siz > > s->picture[1]->linesize[i] = mjpeg_data->linesize[i]; > > > > ret = av_frame_ref(data, s->picture[1]); > > + if (ret < 0) > > + return ret; > > } > > > > - return ret; > > + return avpkt->size; > > } > > > > static const AVClass smvjpegdec_class = { > > -- > > 2.11.0 > > > > _______________________________________________ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > > > lgtm applied thx [...]
diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index e319e5781b..018e135b30 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -200,9 +200,11 @@ static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_siz s->picture[1]->linesize[i] = mjpeg_data->linesize[i]; ret = av_frame_ref(data, s->picture[1]); + if (ret < 0) + return ret; } - return ret; + return avpkt->size; } static const AVClass smvjpegdec_class = {
Most decoders return the amount of data used. This is more consistent Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/smvjpegdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)