| Message ID | 20231102235016.3935-2-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | c0a18e884c2d24d1052147082c358cb6929e97f1 |
| Headers | show |
| Series | [FFmpeg-devel,1/4] avfilter/framesync: cuddle () closer around = | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Thu, Nov 2, 2023, 19:50 Michael Niedermayer <michael@niedermayer.cc> wrote: > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavfilter/buffersink.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c > index 9426ded7ee3..ca2af1bc077 100644 > --- a/libavfilter/buffersink.c > +++ b/libavfilter/buffersink.c > @@ -293,7 +293,7 @@ static int asink_query_formats(AVFilterContext *ctx) > cleanup_redundant_layouts(ctx); > for (i = 0; i < NB_ITEMS(buf->channel_layouts); i++) > if ((ret = av_channel_layout_from_mask(&layout, > buf->channel_layouts[i])) < 0 || > - (ret = ff_add_channel_layout(&layouts, &layout) < 0)) > + (ret = ff_add_channel_layout(&layouts, &layout)) < 0) > return ret; > for (i = 0; i < NB_ITEMS(buf->channel_counts); i++) { > layout = FF_COUNT2LAYOUT(buf->channel_counts[i]); > -- > 2.17.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". > This and 1/2 seem a bit frivolous, but providing they don't violate the project style guide, LGTM. -- Sean McGovern >
Michael Niedermayer (12023-11-03): > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavfilter/buffersink.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Patches 1 and 2 look good to me. Good catch. Regards,
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 9426ded7ee3..ca2af1bc077 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -293,7 +293,7 @@ static int asink_query_formats(AVFilterContext *ctx) cleanup_redundant_layouts(ctx); for (i = 0; i < NB_ITEMS(buf->channel_layouts); i++) if ((ret = av_channel_layout_from_mask(&layout, buf->channel_layouts[i])) < 0 || - (ret = ff_add_channel_layout(&layouts, &layout) < 0)) + (ret = ff_add_channel_layout(&layouts, &layout)) < 0) return ret; for (i = 0; i < NB_ITEMS(buf->channel_counts); i++) { layout = FF_COUNT2LAYOUT(buf->channel_counts[i]);
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavfilter/buffersink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)