[FFmpeg-devel] [PATCH] tools/target_dec_fuzzer: Fix build failure from channels API

[James Almer]

On 3/15/2022 7:34 PM, Michael Niedermayer wrote:
> Regression since 2f8ccca2fa94ce256ff77baa18f462c1abd8d2cc and surrounding commits
> 
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>   tools/target_dec_fuzzer.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
> index eaa26b0e62..3bd1eff3ce 100644
> --- a/tools/target_dec_fuzzer.c
> +++ b/tools/target_dec_fuzzer.c
> @@ -47,6 +47,7 @@
>   
>   #include "config.h"
>   #include "libavutil/avassert.h"
> +#include "libavutil/avstring.h"

Why?

>   #include "libavutil/cpu.h"
>   #include "libavutil/imgutils.h"
>   #include "libavutil/intreadwrite.h"
> @@ -273,7 +274,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
>           extradata_size = bytestream2_get_le32(&gbc);
>   
>           ctx->sample_rate                        = bytestream2_get_le32(&gbc) & 0x7FFFFFFF;
> -        ctx->ch_layout.channels                 = (unsigned)bytestream2_get_le32(&gbc) % FF_SANE_NB_CHANNELS;
> +        ctx->ch_layout.nb_channels              = (unsigned)bytestream2_get_le32(&gbc) % FF_SANE_NB_CHANNELS;

LGTM, sorry about the breakage.

>           ctx->block_align                        = bytestream2_get_le32(&gbc) & 0x7FFFFFFF;
>           ctx->codec_tag                          = bytestream2_get_le32(&gbc);
>           if (c->codec_tags) {