Merge commit '88fd836a015a5f3380df74592e440e7d1e5b8000'
authorJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:27:03 +0000 (15:27 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:27:03 +0000 (15:27 -0300)
commit0ed61546c4594480b7c09a0c79da24d78968fbf0
tree60791ccb8343a46db69efe6e89d53c66dfadd06b
parentea049ad862a4b2b398bbdade5af36291d786e02d
parent88fd836a015a5f3380df74592e440e7d1e5b8000
Merge commit '88fd836a015a5f3380df74592e440e7d1e5b8000'

* commit '88fd836a015a5f3380df74592e440e7d1e5b8000':
  lavfi: Drop deprecated way of passing options for a few filters

Merged-by: James Almer <jamrial@gmail.com>
libavfilter/af_channelmap.c
libavfilter/af_join.c
libavfilter/avfilter.c
libavfilter/buffersrc.c
libavfilter/version.h
libavfilter/vf_aspect.c