aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/af_join.c
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-03-23 16:08:49 +0100
committerClément Bœsch <u@pkh.me>2017-03-23 16:08:49 +0100
commit295450e7f4382ce935fecbd21b57ff179e5babe2 (patch)
tree699c6eb590a70f7658d609db8591c3c551d295d8 /libavfilter/af_join.c
parentcc012c46e8b8668e8d8bb47aea393147b80c63ce (diff)
parente7e5be8635c1cf0588d2a07e59374135de6da55a (diff)
downloadffmpeg-295450e7f4382ce935fecbd21b57ff179e5babe2.tar.gz
Merge commit 'e7e5be8635c1cf0588d2a07e59374135de6da55a'
* commit 'e7e5be8635c1cf0588d2a07e59374135de6da55a': APIchanges: Expand the name of recently added pixel formats This commit is a noop, we don't have this entry. Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavfilter/af_join.c')
0 files changed, 0 insertions, 0 deletions