[FFmpeg-cvslog] Merge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 17:49:13 2013 +0200| [eebe0b02245c7aa9a0f14cc24c2e540ca758f5c9] | committer: Michael Niedermayer

Merge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e'

* commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e':
  vf_delogo: switch to an AVOptions-based system.

Conflicts:
	libavfilter/vf_delogo.c

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

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