[FFmpeg-cvslog] Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 28 13:44:34 2013 +0200| [b0edd599940491d04a49b6b4e85189460313ebd9] | committer: Michael Niedermayer

Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'

* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
  Add missing deprecation attributes

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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