[FFmpeg-cvslog] Merge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 16 08:48:45 2013 +0100| [fab8a89abeae6bab5d2556d0116ca270ff6da5ed] | committer: Michael Niedermayer

Merge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13'

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

Conflicts:
	libavfilter/vf_yadif.c

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

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