Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Feb 2013 08:03:58 +0000 (09:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Feb 2013 08:09:38 +0000 (09:09 +0100)
commit446f7c62a2d1358a276212300d09f9af88f9a228
treedd764077643dfd0d023a94cd82cee99823d97ebb
parentfab8a89abeae6bab5d2556d0116ca270ff6da5ed
parent64ed397635ef2666b0ca0c8d8c60a8bc44581d82
Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'

* commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82':
  vf_yadif: fix out-of line reads

Conflicts:
libavfilter/vf_yadif.c
tests/ref/fate/filter-yadif-mode0
tests/ref/fate/filter-yadif-mode1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_yadif.c
libavfilter/x86/vf_yadif_init.c
libavfilter/yadif.h
tests/ref/fate/filter-yadif-mode0
tests/ref/fate/filter-yadif-mode1