Merge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Feb 2013 07:48:45 +0000 (08:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Feb 2013 07:48:45 +0000 (08:48 +0100)
commitfab8a89abeae6bab5d2556d0116ca270ff6da5ed
treec70e631310ab2396ed0cba17293fea0258163792
parentb9c544891b05a78e85aa1a4f128dcab5cf221746
parentccd70d9c1689990e5aef2de383199bbc7cf60d13
Merge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13'

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

Conflicts:
libavfilter/vf_yadif.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_yadif.c