Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 16:10:55 +0000 (17:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 16:10:55 +0000 (17:10 +0100)
commit71cf094e1be086bce4c535b1fe0d96a0449486ae
treec1608e1f7216f00ac1485e6ee6a911ecfbcc0a52
parentf7c4b76c488b4901133addb3f7875ef3ac4ae9c4
parent9f1223562e134bac6345a465870b9d56ff7d60cf
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>
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/version.h