Merge commit '4a37d4b3f8137a4c2bbbca043de076af966b9446'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 21:30:57 +0000 (23:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 21:31:01 +0000 (23:31 +0200)
commit9f3ae7aafd5ff3eadc9ab0be6a155de5493205ab
tree8ada4d5bf70a727e22ef5bc68591cbadb561fee7
parent838d803155dd7bcdf87db409af9e151aca3329ae
parent4a37d4b3f8137a4c2bbbca043de076af966b9446
Merge commit '4a37d4b3f8137a4c2bbbca043de076af966b9446'

* commit '4a37d4b3f8137a4c2bbbca043de076af966b9446':
  lavfi: add const to the pads parameter of avfilter_pad_get_name/type
  lavfi: add const to AVFilterContext.filter.

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