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>

2 files changed, 93 insertions, 93 deletions

diff --git a/tests/ref/fate/filter-yadif-mode0 b/tests/ref/fate/filter-yadif-mode0
index 7014333c4c..162ba96ac1 100644
--- a/tests/ref/fate/filter-yadif-mode0
+++ b/tests/ref/fate/filter-yadif-mode0
@@ -1,32 +1,32 @@
 #tb 0: 1/25
-0,          9,          9,        1,   622080, 0x4440caef
-0,         10,         10,        1,   622080, 0xce67e69d
-0,         11,         11,        1,   622080, 0x1dbdc653
-0,         12,         12,        1,   622080, 0x55c791d0
-0,         13,         13,        1,   622080, 0x8193740b
-0,         14,         14,        1,   622080, 0x7125970f
-0,         15,         15,        1,   622080, 0xeb63783a
-0,         16,         16,        1,   622080, 0x7080590b
-0,         17,         17,        1,   622080, 0x13f8175b
-0,         18,         18,        1,   622080, 0x3e550e94
-0,         19,         19,        1,   622080, 0x7f9d66f7
-0,         20,         20,        1,   622080, 0x068eda80
-0,         21,         21,        1,   622080, 0x843997f7
-0,         22,         22,        1,   622080, 0x88207ca3
-0,         23,         23,        1,   622080, 0x353eed75
-0,         24,         24,        1,   622080, 0xf93e92b0
-0,         25,         25,        1,   622080, 0xd0811094
-0,         26,         26,        1,   622080, 0xb04a3141
-0,         27,         27,        1,   622080, 0x4ab84909
-0,         28,         28,        1,   622080, 0x4700b8f9
-0,         29,         29,        1,   622080, 0x6305aeba
-0,         30,         30,        1,   622080, 0x153faa3e
-0,         31,         31,        1,   622080, 0xae724063
-0,         32,         32,        1,   622080, 0xbe4fe779
-0,         33,         33,        1,   622080, 0x209ed8c7
-0,         34,         34,        1,   622080, 0xe2bbac96
-0,         35,         35,        1,   622080, 0xe945441e
-0,         36,         36,        1,   622080, 0x3590bd5d
-0,         37,         37,        1,   622080, 0x8f3ef716
-0,         38,         38,        1,   622080, 0x0109f125
-0,         39,         39,        1,   622080, 0x230c373f
+0,          9,          9,        1,   622080, 0x6331caee
+0,         10,         10,        1,   622080, 0xa459e690
+0,         11,         11,        1,   622080, 0x6429c648
+0,         12,         12,        1,   622080, 0xa49891ca
+0,         13,         13,        1,   622080, 0x2a887404
+0,         14,         14,        1,   622080, 0xe8d49705
+0,         15,         15,        1,   622080, 0x1b627835
+0,         16,         16,        1,   622080, 0x686858fd
+0,         17,         17,        1,   622080, 0x2675174f
+0,         18,         18,        1,   622080, 0x78470e7f
+0,         19,         19,        1,   622080, 0xffb366ec
+0,         20,         20,        1,   622080, 0xd575da72
+0,         21,         21,        1,   622080, 0x5fb297f7
+0,         22,         22,        1,   622080, 0xbac77ca0
+0,         23,         23,        1,   622080, 0x3276ed72
+0,         24,         24,        1,   622080, 0x264092b2
+0,         25,         25,        1,   622080, 0x20ba1094
+0,         26,         26,        1,   622080, 0x76cc3139
+0,         27,         27,        1,   622080, 0x469a4902
+0,         28,         28,        1,   622080, 0x0ed7b8f5
+0,         29,         29,        1,   622080, 0xdc51aeac
+0,         30,         30,        1,   622080, 0xee06aa36
+0,         31,         31,        1,   622080, 0x7372405f
+0,         32,         32,        1,   622080, 0x9e0ee776
+0,         33,         33,        1,   622080, 0x39e6d8c9
+0,         34,         34,        1,   622080, 0x51d9ac9a
+0,         35,         35,        1,   622080, 0x2b63441d
+0,         36,         36,        1,   622080, 0x58afbd5e
+0,         37,         37,        1,   622080, 0xb972f716
+0,         38,         38,        1,   622080, 0x6a6df129
+0,         39,         39,        1,   622080, 0x28b1373d
diff --git a/tests/ref/fate/filter-yadif-mode1 b/tests/ref/fate/filter-yadif-mode1
index 87c8d97b6d..f1f513ef3c 100644
--- a/tests/ref/fate/filter-yadif-mode1
+++ b/tests/ref/fate/filter-yadif-mode1
@@ -1,63 +1,63 @@
 #tb 0: 1/50
-0,         18,         18,        1,   622080, 0x4440caef
-0,         19,         19,        1,   622080, 0xa5cea88b
-0,         20,         20,        1,   622080, 0xce67e69d
-0,         21,         21,        1,   622080, 0x9a57891f
-0,         22,         22,        1,   622080, 0x1dbdc653
-0,         23,         23,        1,   622080, 0xc171c0c5
-0,         24,         24,        1,   622080, 0x55c791d0
-0,         25,         25,        1,   622080, 0x20db9890
-0,         26,         26,        1,   622080, 0x8193740b
-0,         27,         27,        1,   622080, 0xdb181d52
-0,         28,         28,        1,   622080, 0x7125970f
-0,         29,         29,        1,   622080, 0xc2b913d1
-0,         30,         30,        1,   622080, 0xeb63783a
-0,         31,         31,        1,   622080, 0xf1d9c5fb
-0,         32,         32,        1,   622080, 0x7080590b
-0,         33,         33,        1,   622080, 0xeda55774
-0,         34,         34,        1,   622080, 0x13f8175b
-0,         35,         35,        1,   622080, 0x01921a16
-0,         36,         36,        1,   622080, 0x3e550e94
-0,         37,         37,        1,   622080, 0xd5047bc9
-0,         38,         38,        1,   622080, 0x7f9d66f7
-0,         39,         39,        1,   622080, 0x2fc806ea
-0,         40,         40,        1,   622080, 0x068eda80
-0,         41,         41,        1,   622080, 0xf0e125a7
-0,         42,         42,        1,   622080, 0x843997f7
-0,         43,         43,        1,   622080, 0x4afe2976
-0,         44,         44,        1,   622080, 0x88207ca3
-0,         45,         45,        1,   622080, 0x637fcbfe
-0,         46,         46,        1,   622080, 0x353eed75
-0,         47,         47,        1,   622080, 0xd9a8f5ac
-0,         48,         48,        1,   622080, 0xf93e92b0
-0,         49,         49,        1,   622080, 0x4540039f
-0,         50,         50,        1,   622080, 0xd0811094
-0,         51,         51,        1,   622080, 0x3039906f
-0,         52,         52,        1,   622080, 0xb04a3141
-0,         53,         53,        1,   622080, 0xe62d2cfa
-0,         54,         54,        1,   622080, 0x4ab84909
-0,         55,         55,        1,   622080, 0x82de12ee
-0,         56,         56,        1,   622080, 0x4700b8f9
-0,         57,         57,        1,   622080, 0x7e849cc9
-0,         58,         58,        1,   622080, 0x6305aeba
-0,         59,         59,        1,   622080, 0x939bf771
-0,         60,         60,        1,   622080, 0x153faa3e
-0,         61,         61,        1,   622080, 0xb67f3233
-0,         62,         62,        1,   622080, 0xae724063
-0,         63,         63,        1,   622080, 0xed2b44b3
-0,         64,         64,        1,   622080, 0xbe4fe779
-0,         65,         65,        1,   622080, 0x380f8563
-0,         66,         66,        1,   622080, 0x209ed8c7
-0,         67,         67,        1,   622080, 0xb964d70f
-0,         68,         68,        1,   622080, 0xe2bbac96
-0,         69,         69,        1,   622080, 0x4f60f7f4
-0,         70,         70,        1,   622080, 0xe945441e
-0,         71,         71,        1,   622080, 0xded0b740
-0,         72,         72,        1,   622080, 0x3590bd5d
-0,         73,         73,        1,   622080, 0xb9a15294
-0,         74,         74,        1,   622080, 0x8f3ef716
-0,         75,         75,        1,   622080, 0x3e2301a8
-0,         76,         76,        1,   622080, 0x0109f125
-0,         77,         77,        1,   622080, 0x5252371e
-0,         78,         78,        1,   622080, 0x230c373f
-0,         79,         79,        1,   622080, 0x5a1ab1f1
+0,         18,         18,        1,   622080, 0x6331caee
+0,         19,         19,        1,   622080, 0x625da883
+0,         20,         20,        1,   622080, 0xa459e690
+0,         21,         21,        1,   622080, 0xce5d891e
+0,         22,         22,        1,   622080, 0x6429c648
+0,         23,         23,        1,   622080, 0x608cc0ba
+0,         24,         24,        1,   622080, 0xa49891ca
+0,         25,         25,        1,   622080, 0x9721987f
+0,         26,         26,        1,   622080, 0x2a887404
+0,         27,         27,        1,   622080, 0x60d71d47
+0,         28,         28,        1,   622080, 0xe8d49705
+0,         29,         29,        1,   622080, 0x821e13cb
+0,         30,         30,        1,   622080, 0x1b627835
+0,         31,         31,        1,   622080, 0x1806c5f4
+0,         32,         32,        1,   622080, 0x686858fd
+0,         33,         33,        1,   622080, 0xab865773
+0,         34,         34,        1,   622080, 0x2675174f
+0,         35,         35,        1,   622080, 0x43a61a14
+0,         36,         36,        1,   622080, 0x78470e7f
+0,         37,         37,        1,   622080, 0xeb877bc6
+0,         38,         38,        1,   622080, 0xffb366ec
+0,         39,         39,        1,   622080, 0xda0906e7
+0,         40,         40,        1,   622080, 0xd575da72
+0,         41,         41,        1,   622080, 0x23ae25a4
+0,         42,         42,        1,   622080, 0x5fb297f7
+0,         43,         43,        1,   622080, 0x99b32978
+0,         44,         44,        1,   622080, 0xbac77ca0
+0,         45,         45,        1,   622080, 0xc1cdcbf9
+0,         46,         46,        1,   622080, 0x3276ed72
+0,         47,         47,        1,   622080, 0x4061f5ab
+0,         48,         48,        1,   622080, 0x264092b2
+0,         49,         49,        1,   622080, 0xa4e2039e
+0,         50,         50,        1,   622080, 0x20ba1094
+0,         51,         51,        1,   622080, 0x984e906e
+0,         52,         52,        1,   622080, 0x76cc3139
+0,         53,         53,        1,   622080, 0xf70e2cf6
+0,         54,         54,        1,   622080, 0x469a4902
+0,         55,         55,        1,   622080, 0x235312e6
+0,         56,         56,        1,   622080, 0x0ed7b8f5
+0,         57,         57,        1,   622080, 0xd0269cc3
+0,         58,         58,        1,   622080, 0xdc51aeac
+0,         59,         59,        1,   622080, 0x1aa5f76e
+0,         60,         60,        1,   622080, 0xee06aa36
+0,         61,         61,        1,   622080, 0xa7103230
+0,         62,         62,        1,   622080, 0x7372405f
+0,         63,         63,        1,   622080, 0x8d7a44b5
+0,         64,         64,        1,   622080, 0x9e0ee776
+0,         65,         65,        1,   622080, 0xd41e8560
+0,         66,         66,        1,   622080, 0x39e6d8c9
+0,         67,         67,        1,   622080, 0x7a23d70c
+0,         68,         68,        1,   622080, 0x51d9ac9a
+0,         69,         69,        1,   622080, 0x8eacf7f2
+0,         70,         70,        1,   622080, 0x2b63441d
+0,         71,         71,        1,   622080, 0x9f71b742
+0,         72,         72,        1,   622080, 0x58afbd5e
+0,         73,         73,        1,   622080, 0x4d645292
+0,         74,         74,        1,   622080, 0xb972f716
+0,         75,         75,        1,   622080, 0xbb5d01a2
+0,         76,         76,        1,   622080, 0x6a6df129
+0,         77,         77,        1,   622080, 0x9e45371e
+0,         78,         78,        1,   622080, 0x28b1373d
+0,         79,         79,        1,   622080, 0xa1cdb1f2