-
Michael Niedermayer authored
* commit '9f122356': lavfi: connect libavresample options to af_resample via AVFilterGraph Conflicts: doc/APIchanges libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
71cf094e