| Message ID | 20200127082821.22770-4-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel,1/4] avformat/mov: Free encryption data on error | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > libavfilter/vf_paletteuse.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c > index 255c9d79e3..408cff786e 100644 > --- a/libavfilter/vf_paletteuse.c > +++ b/libavfilter/vf_paletteuse.c > @@ -912,12 +912,12 @@ static int apply_palette(AVFilterLink *inlink, AVFrame *in, AVFrame **outf) > s->last_out, out, &x, &y, &w, &h); > av_frame_unref(s->last_in); > av_frame_unref(s->last_out); > - if (av_frame_ref(s->last_in, in) < 0 || > - av_frame_ref(s->last_out, out) < 0 || > - av_frame_make_writable(s->last_in) < 0) { > + if ((ret = av_frame_ref(s->last_in, in)) < 0 || > + (ret = av_frame_ref(s->last_out, out)) < 0 || > + (ret = av_frame_make_writable(s->last_in)) < 0) { > av_frame_free(&out); > *outf = NULL; > - return AVERROR(ENOMEM); > + return ret; > } > > ff_dlog(ctx, "%dx%d rect: (%d;%d) -> (%d,%d) [area:%dx%d]\n", > Ping. - Andreas
lgtm On 1/27/20, Andreas Rheinhardt <andreas.rheinhardt@gmail.com> wrote: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > libavfilter/vf_paletteuse.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c > index 255c9d79e3..408cff786e 100644 > --- a/libavfilter/vf_paletteuse.c > +++ b/libavfilter/vf_paletteuse.c > @@ -912,12 +912,12 @@ static int apply_palette(AVFilterLink *inlink, AVFrame > *in, AVFrame **outf) > s->last_out, out, &x, &y, &w, &h); > av_frame_unref(s->last_in); > av_frame_unref(s->last_out); > - if (av_frame_ref(s->last_in, in) < 0 || > - av_frame_ref(s->last_out, out) < 0 || > - av_frame_make_writable(s->last_in) < 0) { > + if ((ret = av_frame_ref(s->last_in, in)) < 0 || > + (ret = av_frame_ref(s->last_out, out)) < 0 || > + (ret = av_frame_make_writable(s->last_in)) < 0) { > av_frame_free(&out); > *outf = NULL; > - return AVERROR(ENOMEM); > + return ret; > } > > ff_dlog(ctx, "%dx%d rect: (%d;%d) -> (%d,%d) [area:%dx%d]\n", > -- > 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".
Paul B Mahol: > lgtm > > On 1/27/20, Andreas Rheinhardt <andreas.rheinhardt@gmail.com> wrote: >> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> >> --- >> libavfilter/vf_paletteuse.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c >> index 255c9d79e3..408cff786e 100644 >> --- a/libavfilter/vf_paletteuse.c >> +++ b/libavfilter/vf_paletteuse.c >> @@ -912,12 +912,12 @@ static int apply_palette(AVFilterLink *inlink, AVFrame >> *in, AVFrame **outf) >> s->last_out, out, &x, &y, &w, &h); >> av_frame_unref(s->last_in); >> av_frame_unref(s->last_out); >> - if (av_frame_ref(s->last_in, in) < 0 || >> - av_frame_ref(s->last_out, out) < 0 || >> - av_frame_make_writable(s->last_in) < 0) { >> + if ((ret = av_frame_ref(s->last_in, in)) < 0 || >> + (ret = av_frame_ref(s->last_out, out)) < 0 || >> + (ret = av_frame_make_writable(s->last_in)) < 0) { >> av_frame_free(&out); >> *outf = NULL; >> - return AVERROR(ENOMEM); >> + return ret; >> } >> >> ff_dlog(ctx, "%dx%d rect: (%d;%d) -> (%d,%d) [area:%dx%d]\n", >> -- >> 2.20.1 >> Applied, thanks. - Andreas
diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index 255c9d79e3..408cff786e 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -912,12 +912,12 @@ static int apply_palette(AVFilterLink *inlink, AVFrame *in, AVFrame **outf) s->last_out, out, &x, &y, &w, &h); av_frame_unref(s->last_in); av_frame_unref(s->last_out); - if (av_frame_ref(s->last_in, in) < 0 || - av_frame_ref(s->last_out, out) < 0 || - av_frame_make_writable(s->last_in) < 0) { + if ((ret = av_frame_ref(s->last_in, in)) < 0 || + (ret = av_frame_ref(s->last_out, out)) < 0 || + (ret = av_frame_make_writable(s->last_in)) < 0) { av_frame_free(&out); *outf = NULL; - return AVERROR(ENOMEM); + return ret; } ff_dlog(ctx, "%dx%d rect: (%d;%d) -> (%d,%d) [area:%dx%d]\n",
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavfilter/vf_paletteuse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)