]> git.sesse.net Git - ffmpeg/commit
avfilter/formats: Avoid allocations when merging formats and samplerates
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Thu, 13 Aug 2020 19:20:22 +0000 (21:20 +0200)
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Wed, 19 Aug 2020 23:35:26 +0000 (01:35 +0200)
commitc0aa3dfaa8ecdb85d735edef8b6b741fa074d44d
treea00be5564ba0a55e749ea632ed437ac61c6e961b
parent55eb24a92fdb44da65364da61917f085286a48d2
avfilter/formats: Avoid allocations when merging formats and samplerates

This is the analogue of cfc65520324ae640299bd321ef88ae76dcee6f78 for
formats and samplerates; in contrast to said commit, one can avoid
allocating a new array for formats as well (the complications of the
generic channel layouts made this impossible for channel layouts).

This commit also starts to move the line continuation '\' chars to the
left to keep them in line with MERGE_REF() as well as with the 80 lines
limit.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
libavfilter/formats.c