Michael Niedermayer 71cf094e1b Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf' ...

* commit '9f1223562e134bac6345a465870b9d56ff7d60cf':
  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>

2013-02-24 17:10:55 +01:00

56 KiB

Raw Blame History

View Raw