-
Michael Niedermayer authored
* commit 'a7e79f6a': avfilter: check filter link validity Conflicts: libavfilter/avfilter.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
fefb152c
* commit 'a7e79f6a': avfilter: check filter link validity Conflicts: libavfilter/avfilter.c Merged-by:Michael Niedermayer <michaelni@gmx.at>