[FFmpeg-cvslog] Revert "avutil/channel_layout: av_channel_layout_describe_bprint: Check for buffer end"

James Almer git at videolan.org
Mon Jul 4 20:07:32 EEST 2022


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Jul  4 14:04:54 2022 -0300| [0afdc95767ea7f70cec91f76f5d3398e08edb61f] | committer: James Almer

Revert "avutil/channel_layout: av_channel_layout_describe_bprint: Check for buffer end"

The doxy for av_channel_layout_describe() states that the user should look
at the return value to check if the string was truncated. Returning an error
code in this scenario goes against this and is an API break.

A proper fix for the timeout was applied to the Matroska demuxer in 94901a9518.

This reverts commit 8154cb7c2ff2afcb1a0842de8c215b7714c814d0.

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

 libavutil/channel_layout.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
index 1887987789..21b70173b7 100644
--- a/libavutil/channel_layout.c
+++ b/libavutil/channel_layout.c
@@ -757,10 +757,6 @@ int av_channel_layout_describe_bprint(const AVChannelLayout *channel_layout,
             if (channel_layout->order == AV_CHANNEL_ORDER_CUSTOM &&
                 channel_layout->u.map[i].name[0])
                 av_bprintf(bp, "@%s", channel_layout->u.map[i].name);
-
-            if (!av_bprint_is_complete(bp))
-                return AVERROR(ENOMEM);
-
         }
         if (channel_layout->nb_channels) {
             av_bprintf(bp, ")");



More information about the ffmpeg-cvslog mailing list