diff options
| author | Marton Balint <cus@passwd.hu> | 2023-12-29 13:41:42 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2024-01-07 22:47:22 +0100 |
| commit | 363b3ec98a0fd49ca9144ac1b16c272a14e1b0df (patch) | |
| tree | 4cf6e25183ca7cb05df6db0344bc8f7e7550950a | |
| parent | e4c96dc96ccea3c74373b5be5bacd94049b429e2 (diff) | |
| download | ffmpeg-363b3ec98a0fd49ca9144ac1b16c272a14e1b0df.tar.gz | |
all: use av_channel_layout_describe_bprint instead of av_channel_layout_describe in a few places
Where an AVBPrint buffer is used later anyway.
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | libavcodec/avcodec.c | 7 | ||||
| -rw-r--r-- | libavfilter/af_amerge.c | 7 | ||||
| -rw-r--r-- | libavfilter/graphdump.c | 4 |
3 files changed, 4 insertions, 14 deletions
diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 2dda310e91..a6c8629f6c 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -656,12 +656,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) if (enc->sample_rate) { av_bprintf(&bprint, "%d Hz, ", enc->sample_rate); } - { - char buf[512]; - int ret = av_channel_layout_describe(&enc->ch_layout, buf, sizeof(buf)); - if (ret >= 0) - av_bprintf(&bprint, "%s", buf); - } + av_channel_layout_describe_bprint(&enc->ch_layout, &bprint); if (enc->sample_fmt != AV_SAMPLE_FMT_NONE && (str = av_get_sample_fmt_name(enc->sample_fmt))) { av_bprintf(&bprint, ", %s", str); diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 83318f99e4..eabd3f8262 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -153,7 +153,6 @@ static int config_output(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; AMergeContext *s = ctx->priv; AVBPrint bp; - char buf[128]; int i; s->bps = av_get_bytes_per_sample(outlink->format); @@ -162,12 +161,10 @@ static int config_output(AVFilterLink *outlink) av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC); for (i = 0; i < s->nb_inputs; i++) { av_bprintf(&bp, "%sin%d:", i ? " + " : "", i); - av_channel_layout_describe(&ctx->inputs[i]->ch_layout, buf, sizeof(buf)); - av_bprintf(&bp, "%s", buf); + av_channel_layout_describe_bprint(&ctx->inputs[i]->ch_layout, &bp); } av_bprintf(&bp, " -> out:"); - av_channel_layout_describe(&outlink->ch_layout, buf, sizeof(buf)); - av_bprintf(&bp, "%s", buf); + av_channel_layout_describe_bprint(&outlink->ch_layout, &bp); av_log(ctx, AV_LOG_VERBOSE, "%s\n", bp.str); return 0; diff --git a/libavfilter/graphdump.c b/libavfilter/graphdump.c index 80f7bf6c98..df79903c52 100644 --- a/libavfilter/graphdump.c +++ b/libavfilter/graphdump.c @@ -30,7 +30,6 @@ static int print_link_prop(AVBPrint *buf, AVFilterLink *link) { const char *format; - char layout[128]; AVBPrint dummy_buffer; if (!buf) { @@ -50,8 +49,7 @@ static int print_link_prop(AVBPrint *buf, AVFilterLink *link) format = av_x_if_null(av_get_sample_fmt_name(link->format), "?"); av_bprintf(buf, "[%dHz %s:", (int)link->sample_rate, format); - av_channel_layout_describe(&link->ch_layout, layout, sizeof(layout)); - av_bprintf(buf, "%s", layout); + av_channel_layout_describe_bprint(&link->ch_layout, buf); av_bprint_chars(buf, ']', 1); break; |