[FFmpeg-cvslog] Merge remote-tracking branch 'mbouron/shorthand-cleanup'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 01:53:08 2013 +0200| [57148122375a8f7aa387bef6b993b936dbb70777] | committer: Michael Niedermayer

Merge remote-tracking branch 'mbouron/shorthand-cleanup'

* mbouron/shorthand-cleanup:
  lavfi/aphaser: switch to AVOption-based system
  lavfi/apad: switch to AVOption-based system
  lavfi/afade: switch to AVOption-base system
  lavfi/blend: switch to AVOption-based system

Conflicts:
	libavfilter/avfilter.c

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

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