Merge commit '8114c101607843a86960bd3e0e9c40487dc2a961'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 08:59:06 +0000 (10:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 08:59:06 +0000 (10:59 +0200)
commit44d4488301c69bc026908011a9b6f9df5add3353
tree3fcc9e8fc0828eb2c539f20db8686b598cefcee4
parent0965be00fe20e30912b3f51a32a3e435e9996f3e
parent8114c101607843a86960bd3e0e9c40487dc2a961
Merge commit '8114c101607843a86960bd3e0e9c40487dc2a961'

* commit '8114c101607843a86960bd3e0e9c40487dc2a961':
  lavfi: add avfilter_get_class().

Conflicts:
libavfilter/avfilter.h

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