[FFmpeg-cvslog] Merge commit '4a37d4b3f8137a4c2bbbca043de076af966b9446'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 23:30:57 2013 +0200| [9f3ae7aafd5ff3eadc9ab0be6a155de5493205ab] | committer: Michael Niedermayer

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

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