diff options
| author | James Almer <jamrial@gmail.com> | 2022-07-04 14:04:54 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-07-04 14:04:54 -0300 |
| commit | 0afdc95767ea7f70cec91f76f5d3398e08edb61f (patch) | |
| tree | 30d6dd8a2b1b1aca24a4f2d89a11e4710db4a45b /libavutil | |
| parent | 94901a9518664a13f3ac8d0062f6600741b9c9aa (diff) | |
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.
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/channel_layout.c | 4 |
1 files changed, 0 insertions, 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, ")"); |