diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 23:56:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 00:31:44 +0200 |
| commit | 86070b8e5a0e0ba087a9ce2a050c00094e29f35b (patch) | |
| tree | 6e82eb3de383fa6f8756c5053d26e52fbf29f07b /tools | |
| parent | 9da369604ecf31d9dce2dee21ed214b8c43264c6 (diff) | |
| parent | bc1a985ba030e9861d24965d42792850b43a43ea (diff) | |
| download | ffmpeg-86070b8e5a0e0ba087a9ce2a050c00094e29f35b.tar.gz | |
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>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions