* commit 'bf4b0ed1':
  Add missing deprecation attributes

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