Merge commit 'bc1a985ba030e9861d24965d42792850b43a43ea'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 21:56:39 +0000 (23:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 22:31:44 +0000 (00:31 +0200)
commit86070b8e5a0e0ba087a9ce2a050c00094e29f35b
tree6e82eb3de383fa6f8756c5053d26e52fbf29f07b
parent9da369604ecf31d9dce2dee21ed214b8c43264c6
parentbc1a985ba030e9861d24965d42792850b43a43ea
Merge commit 'bc1a985ba030e9861d24965d42792850b43a43ea'

* commit 'bc1a985ba030e9861d24965d42792850b43a43ea':
  lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().

Conflicts:
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
libavfilter/internal.h
libavfilter/version.h