diff --git a/libswscale/output.c b/libswscale/output.c
index e684feceda..c95ccdfc36 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
@@ -2716,7 +2716,7 @@ yuv2xv36_X_c(SwsContext *c, const int16_t *lumFilter,
         output_pixels(dest + 8 * i + 2, Y, 15, 12, 4)
         output_pixels(dest + 8 * i + 0, U, 15, 12, 4)
         output_pixels(dest + 8 * i + 4, V, 15, 12, 4)
-        AV_WN16(dest + 8 * i + 6, A << 4);
+        output_pixels(dest + 8 * i + 6, A,  0, 12, 4);
     }
 }
 
diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy
index c506d3de10..6c0f279284 100644
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@@ -107,7 +107,7 @@ vyu444              93912234400a4373b1a6b5c4e4b1a4ef
 x2bgr10le           550c0d190cf695afa4eaacb644db6b75
 x2rgb10le           c1e3ac21be04a16bb157b22784524520
 xv30le              7dfdd664a9792bb06a19a63353828da0
-xv36be              502f8a04f496740c0ebf82bce35e6a9d
+xv36be              9f556ee59a672fd8725f0bb36ce3e4b0
 xv36le              e08dcbde02f1c28a3554f372ad1278e2
 xyz12be             a1ef56bf746d71f59669c28e48fc8450
 xyz12le             831ff03c1ba4ef19374686f16a064d8c
diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop
index 660f3b1842..cae5f1d389 100644
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@@ -104,7 +104,7 @@ vyu444              5d976b25782ff69e4b3b18453fa1447b
 x2bgr10le           84de725b85662c362862820dc4a309aa
 x2rgb10le           f4265aca7a67dbfa9354370098ca6f33
 xv30le              7e2350aea136c6fb76dae54e9d3fe1f8
-xv36be              888aa586193b6e96dd6b9350503dad99
+xv36be              23b6f253fcb375e4145cfcb562268c5f
 xv36le              778286003497f92b84d0bd8258d6b85d
 xyz12be             cb4571f9aaa7b59f999ef327276104b7
 xyz12le             cd6aae8d26b18bdb4b9d068586276d91
diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field
index 3ec9293fbd..786be650e9 100644
--- a/tests/ref/fate/filter-pixfmts-field
+++ b/tests/ref/fate/filter-pixfmts-field
@@ -107,7 +107,7 @@ vyu444              b139fb4ddaef12a7542a68277211efa7
 x2bgr10le           dbe21538d7cb1744914f6bd46ec09b55
 x2rgb10le           a18bc4ae5274e0a8cca9137ecd50c677
 xv30le              a8e8bfb66178ad5cbef5c82cedc1d3da
-xv36be              f6b7e1b437aaf1c9d1c69b095779fd4e
+xv36be              bcc7bda2d0a5d43db4464af6a4cb5d65
 xv36le              ba99f258370f2a56993e8760e6b30194
 xyz12be             d2fa69ec91d3ed862f2dac3f8e7a3437
 xyz12le             02bccd5e0b6824779a1f848b0ea3e3b5
diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder
index 1e77222b52..f99baf036f 100644
--- a/tests/ref/fate/filter-pixfmts-fieldorder
+++ b/tests/ref/fate/filter-pixfmts-fieldorder
@@ -96,7 +96,7 @@ vyu444              3ddab207d561a3ee5efae09e504207f2
 x2bgr10le           86474d84f26c5c51d6f75bf7e1de8da8
 x2rgb10le           cdf6a9e8a8d081aa768c6ae2e6221676
 xv30le              8d1921d4a210d8107c20a805cb9a8117
-xv36be              e99aece2ae4edc6da58067810452afb6
+xv36be              962386c88268f4382004c3a7a82c5eb8
 xv36le              bcceffc985aaa8414c4b8072aa0889bd
 xyz12be             15f5cda71de5fef9cec5e75e3833b6bc
 xyz12le             7be6c8781f38c21a6b8f602f62ca31e6
diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip
index a279d22c42..346f6cd04e 100644
--- a/tests/ref/fate/filter-pixfmts-hflip
+++ b/tests/ref/fate/filter-pixfmts-hflip
@@ -104,7 +104,7 @@ vyu444              7b72337f92a7223fd115265e2f769276
 x2bgr10le           827cc659f29378e00c5a7d2c0ada8f9a
 x2rgb10le           d4a8189b65395a88d0a38a7053f3359f
 xv30le              7370eadd13a2fc79186443713a639332
-xv36be              2abe7272fffa70d1bf836b6235508091
+xv36be              98f578df965eed369f46cb135e2d1345
 xv36le              e478b4b54698beb3ce1b9a2dd691d544
 xyz12be             25f90259ff8a226befdaec3dfe82996e
 xyz12le             926c0791d59aaff61b2778e8ada3316d
diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il
index 74d582d442..b57bc9dc1f 100644
--- a/tests/ref/fate/filter-pixfmts-il
+++ b/tests/ref/fate/filter-pixfmts-il
@@ -106,7 +106,7 @@ vyu444              50e9e24a38afc81541a536d06aab5ebe
 x2bgr10le           135acaff8318cf9861bb0f7849a9e5e9
 x2rgb10le           517fb186f523dc7cdc5c5c6967cfbe94
 xv30le              ccd81ba2ba845917d5d1c9fa2a6e2fc6
-xv36be              014de4ca53607cf7c676161063b3a2ac
+xv36be              3bbb949278ea55cc947ee03bd9c27c2d
 xv36le              102c0e817d375ddd6b2cfbb4262dec95
 xyz12be             7c7d54c55f136cbbc50b18029f3be0b3
 xyz12le             090ba6b1170baf2b1358b43b971d33b0
diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null
index c506d3de10..6c0f279284 100644
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@@ -107,7 +107,7 @@ vyu444              93912234400a4373b1a6b5c4e4b1a4ef
 x2bgr10le           550c0d190cf695afa4eaacb644db6b75
 x2rgb10le           c1e3ac21be04a16bb157b22784524520
 xv30le              7dfdd664a9792bb06a19a63353828da0
-xv36be              502f8a04f496740c0ebf82bce35e6a9d
+xv36be              9f556ee59a672fd8725f0bb36ce3e4b0
 xv36le              e08dcbde02f1c28a3554f372ad1278e2
 xyz12be             a1ef56bf746d71f59669c28e48fc8450
 xyz12le             831ff03c1ba4ef19374686f16a064d8c
diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale
index f0c0d51a2d..e60e2c55d3 100644
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@@ -107,7 +107,7 @@ vyu444              d663334119da56e36aca1e8e4eb29a39
 x2bgr10le           d57b9a99033cc7b65ddd111578f2d385
 x2rgb10le           d56bdb23fa6a8e12a0b4394987f89935
 xv30le              a2a351cbf936651b558abfc70a925057
-xv36be              59388bd217c05744e702c00a68f0a297
+xv36be              4d084adca0228d7750d1e2e877e0d79b
 xv36le              de9c74e94dc19c828e1572aa283d8aca
 xyz12be             c7ba8345998c0141ddc079cdd29b1a40
 xyz12le             95f5d3a0de834cc495c9032a14987cde
diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose
index 89c53039ef..da6db18cd3 100644
--- a/tests/ref/fate/filter-pixfmts-transpose
+++ b/tests/ref/fate/filter-pixfmts-transpose
@@ -96,7 +96,7 @@ vyu444              e70a294738165223928fddc9970b8381
 x2bgr10le           4aa774b6d8f6d446a64f1f288e5c97eb
 x2rgb10le           09cb1d98fe17ad8a6d9d3bec97ddc845
 xv30le              ebe26bf75c64406dea8b8a160c978fd9
-xv36be              1b4166ba6cdcfc935763651105121002
+xv36be              2261a0e3db5ee607d37f68d19704ae15
 xv36le              9202133de91bf64c76ca27d5cd0c816a
 xyz12be             68e5cba640f6e4ef72dff950e88b5342
 xyz12le             8b6b6a6db4d7561e80db88ccaecce7a9
diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip
index e0bdad24ad..eac95048b5 100644
--- a/tests/ref/fate/filter-pixfmts-vflip
+++ b/tests/ref/fate/filter-pixfmts-vflip
@@ -107,7 +107,7 @@ vyu444              815de7c57dc8afafb3de908a4a280582
 x2bgr10le           795b66a5fc83cd2cf300aae51c230f80
 x2rgb10le           262c502230cf3724f8e2cf4737f18a42
 xv30le              f61ddeb49ba8fb7c92294ad621cbf896
-xv36be              079c30b035dae1a0a9d54753334aad30
+xv36be              c0272372d3e1a59adb3931ee433a5d5b
 xv36le              ffe6ab75ebc09134c3451f8f6ef0d501
 xyz12be             23fa9fb36d49dce61e284d41b83e0e6b
 xyz12le             ef73e6d1f932a9a355df1eedd628394f