Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 11:27:33 +0000 (13:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 11:30:17 +0000 (13:30 +0200)
commit828044aca289f12356e1bdcda232430d8ed22e2d
tree89109e640f924cc01ea92b6879c752b3f9bb0257
parentd2752ef0615d0ce9cdf6effed97cd4750ffde4a9
parent4fa1f52e33b70029e2b621852f3af7c1ef9aecff
Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'

* commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff':
  af_resample: switch to an AVOptions-based system.

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/avfilter.c
libavfilter/avfilter.h