[FFmpeg-cvslog] Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 17:10:55 2013 +0100| [71cf094e1be086bce4c535b1fe0d96a0449486ae] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71cf094e1be086bce4c535b1fe0d96a0449486ae
---