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

Merge commit 'ccd70d9c' 


* commit 'ccd70d9c':
  vf_yadif: factorize initializing the filtering callbacks

Conflicts:
	libavfilter/vf_yadif.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents b9c54489 ccd70d9c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 14 deletions
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