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