diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-12-02 19:19:19 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-12-03 17:01:06 +0100 |
| commit | b7e3ae19b8d3dc1b14c600220a47171e5e3ef746 (patch) | |
| tree | 8416bbd4b88ab7fba05732b8f7ddd52c23ce32fb /libavdevice | |
| parent | 60a2c74a5eaf8d4ab16a68842be3b9cfbd45b467 (diff) | |
| download | ffmpeg-b7e3ae19b8d3dc1b14c600220a47171e5e3ef746.tar.gz | |
avdevice/lavfi: Simplify setting sample_fmts
The length of this list is a compile-time constant, so there is
no need to calculate it again at runtime.
(This also avoids an implicit requirement of -1 == AV_SAMPLE_FMT_NONE.)
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/lavfi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index b208b1a928..d63a6f66b3 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -271,14 +271,15 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) } else if (type == AVMEDIA_TYPE_AUDIO) { static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, - AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_DBL, -1 + AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_DBL, }; ret = avfilter_graph_create_filter(&sink, abuffersink, inout->name, NULL, NULL, lavfi->graph); if (ret >= 0) - ret = av_opt_set_int_list(sink, "sample_fmts", sample_fmts, AV_SAMPLE_FMT_NONE, AV_OPT_SEARCH_CHILDREN); + ret = av_opt_set_bin(sink, "sample_fmts", (const uint8_t*)sample_fmts, + sizeof(sample_fmts), AV_OPT_SEARCH_CHILDREN); if (ret < 0) goto end; ret = av_opt_set_int(sink, "all_channel_counts", 1, |