lavfi: merge two variables after a recent commit.
authorNicolas George <george@nsup.org>
Tue, 20 Dec 2016 14:49:17 +0000 (15:49 +0100)
committerNicolas George <george@nsup.org>
Thu, 12 Jan 2017 13:06:16 +0000 (14:06 +0100)
commit846f1421349e923b100ce290ba25b5b5b897b437
tree6fcfd703334f0519d85a751da48acb8e86efdfa8
parent28c62df672865890cbb13e5f0e94bde29c8fbacd
lavfi: merge two variables after a recent commit.
libavfilter/avfilter.c