Skip to content
Snippets Groups Projects
Commit eebe0b02 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '63e58c55' 


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

Conflicts:
	libavfilter/vf_delogo.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 1c3cdf53 63e58c55
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment