* commit 'e73996954d8e00117056dcefb38ef3d4d2f37967': filtfmts-test: Fix use of deprecated API Conflicts: libavfilter/filtfmts.c See: f12174c8ce Merged-by: Michael Niedermayer <michaelni@gmx.at>
f12174c8ce