Merge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 15:49:13 +0000 (17:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 15:54:20 +0000 (17:54 +0200)
commiteebe0b02245c7aa9a0f14cc24c2e540ca758f5c9
treee96e0b7c7741bfec5efad12d966d2d1465ebb523
parent1c3cdf533ba0f47e70b166b335fe3282264950d7
parent63e58c55c17d7f8b5eec9c082fe0f8edc305a24e
Merge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e'

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

Conflicts:
libavfilter/vf_delogo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi
libavfilter/avfilter.c
libavfilter/vf_delogo.c