* commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24': avfilter: fix leaks on error in ff_filter_frame Conflicts: libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>