[FFmpeg-cvslog] avfilter/buffersink: fix order of operation with = and <0

Michael Niedermayer git at videolan.org
Sat Nov 4 01:37:03 EET 2023


ffmpeg | branch: release/5.1 | Michael Niedermayer <michael at niedermayer.cc> | Thu Nov  2 23:49:53 2023 +0100| [e531abaf3c41953618573bef9a2568f7644626b6] | committer: Michael Niedermayer

avfilter/buffersink: fix order of operation with = and <0

Reviewed-by: Sean McGovern <gseanmcg at gmail.com>
Reviewed-by: Nicolas George <george at nsup.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit c0a18e884c2d24d1052147082c358cb6929e97f1)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e531abaf3c41953618573bef9a2568f7644626b6
---

 libavfilter/buffersink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index e269cf72d1..5e38180f53 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -313,7 +313,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]);



More information about the ffmpeg-cvslog mailing list