Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: add dithering to yuv2yuvX_altivec_real
  rv34: free+allocate buffer instead of reallocating it to preserve alignment
  h264: add missing brackets.
  swscale: use 15-bit intermediates for 9/10-bit scaling.

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

9 files changed, 58 insertions, 58 deletions

diff --git a/tests/ref/lavfi/pixdesc b/tests/ref/lavfi/pixdesc
index 35e08a6ac7..879314f23d 100644
--- a/tests/ref/lavfi/pixdesc
+++ b/tests/ref/lavfi/pixdesc
@@ -1,8 +1,8 @@
 abgr                037bf9df6a765520ad6d490066bf4b89
 argb                c442a8261c2265a07212ef0f72e35f5a
 bgr24               0d0cb38ab3fa0b2ec0865c14f78b217b
-bgr48be             74dedaaacae8fd1ef46e05f78cf29d62
-bgr48le             0eb7d30801eac6058814bddd330b3c76
+bgr48be             00624e6c7ec7ab19897ba2f0a3257fe8
+bgr48le             d02c235ebba7167881ca2d576497ff84
 bgr4_byte           50d23cc82d9dcef2fd12adb81fb9b806
 bgr555be            49f01b1f1f0c84fd9e776dd34cc3c280
 bgr555le            378d6ac4223651a1adcbf94a3d0d807b
@@ -18,8 +18,8 @@ monow               9251497f3b0634f1165d12d5a289d943
 nv12                e0af357888584d36eec5aa0f673793ef
 nv21                9a3297f3b34baa038b1f37cb202b512f
 rgb24               b41eba9651e1b5fe386289b506188105
-rgb48be             e3bc84c9af376fb6d0f0293cc7b713a6
-rgb48le             f51c0e71638a822458329abb2f4052c7
+rgb48be             cc139ec1dd9451f0e049c0cb3a0c8aa2
+rgb48le             86c5608904f75360d492dbc5c9589969
 rgb4_byte           c93ba89b74c504e7f5ae9d9ab1546c73
 rgb555be            912a62c5e53bfcbac2a0340e10973cf2
 rgb555le            a937a0fc764fb57dc1b3af87cba0273c
@@ -40,12 +40,12 @@ yuv420p9le          16543fda8f87d94a6cf857d2e8d4461a
 yuv422p             c9bba4529821d796a6ab09f6a5fd355a
 yuv422p10be         bdc13b630fd668b34c6fe1aae28dfc71
 yuv422p10le         d0607c260a45c973e6639f4e449730ad
-yuv422p16be         dc9886f2fccf87cc54b27e071a2c251e
-yuv422p16le         f181c8d8436f1233ba566d9bc88005ec
+yuv422p16be         4e9b3b3467aeebb6a528cee5966800ed
+yuv422p16le         f87c81bf16916b64d201359be0b4b6f4
 yuv440p             5a064afe2b453bb52cdb3f176b1aa1cf
 yuv444p             0a98447b78fd476aa39686da6a74fa2e
-yuv444p16be         af555dbaa401b142a995566864f47545
-yuv444p16le         a803e8016997dad95c5b2a72f54c34d6
+yuv444p16be         3ad639fff73e56f3b09dd20c335478d6
+yuv444p16le         8a7e66dc91ab7971fd24a9105ff2699b
 yuva420p            a29884f3f3dfe1e00b961bc17bef3d47
 yuvj420p            32eec78ba51857b16ce9b813a49b7189
 yuvj422p            0dfa0ed434f73be51428758c69e082cb
diff --git a/tests/ref/lavfi/pixfmts_copy b/tests/ref/lavfi/pixfmts_copy
index 35e08a6ac7..879314f23d 100644
--- a/tests/ref/lavfi/pixfmts_copy
+++ b/tests/ref/lavfi/pixfmts_copy
@@ -1,8 +1,8 @@
 abgr                037bf9df6a765520ad6d490066bf4b89
 argb                c442a8261c2265a07212ef0f72e35f5a
 bgr24               0d0cb38ab3fa0b2ec0865c14f78b217b
-bgr48be             74dedaaacae8fd1ef46e05f78cf29d62
-bgr48le             0eb7d30801eac6058814bddd330b3c76
+bgr48be             00624e6c7ec7ab19897ba2f0a3257fe8
+bgr48le             d02c235ebba7167881ca2d576497ff84
 bgr4_byte           50d23cc82d9dcef2fd12adb81fb9b806
 bgr555be            49f01b1f1f0c84fd9e776dd34cc3c280
 bgr555le            378d6ac4223651a1adcbf94a3d0d807b
@@ -18,8 +18,8 @@ monow               9251497f3b0634f1165d12d5a289d943
 nv12                e0af357888584d36eec5aa0f673793ef
 nv21                9a3297f3b34baa038b1f37cb202b512f
 rgb24               b41eba9651e1b5fe386289b506188105
-rgb48be             e3bc84c9af376fb6d0f0293cc7b713a6
-rgb48le             f51c0e71638a822458329abb2f4052c7
+rgb48be             cc139ec1dd9451f0e049c0cb3a0c8aa2
+rgb48le             86c5608904f75360d492dbc5c9589969
 rgb4_byte           c93ba89b74c504e7f5ae9d9ab1546c73
 rgb555be            912a62c5e53bfcbac2a0340e10973cf2
 rgb555le            a937a0fc764fb57dc1b3af87cba0273c
@@ -40,12 +40,12 @@ yuv420p9le          16543fda8f87d94a6cf857d2e8d4461a
 yuv422p             c9bba4529821d796a6ab09f6a5fd355a
 yuv422p10be         bdc13b630fd668b34c6fe1aae28dfc71
 yuv422p10le         d0607c260a45c973e6639f4e449730ad
-yuv422p16be         dc9886f2fccf87cc54b27e071a2c251e
-yuv422p16le         f181c8d8436f1233ba566d9bc88005ec
+yuv422p16be         4e9b3b3467aeebb6a528cee5966800ed
+yuv422p16le         f87c81bf16916b64d201359be0b4b6f4
 yuv440p             5a064afe2b453bb52cdb3f176b1aa1cf
 yuv444p             0a98447b78fd476aa39686da6a74fa2e
-yuv444p16be         af555dbaa401b142a995566864f47545
-yuv444p16le         a803e8016997dad95c5b2a72f54c34d6
+yuv444p16be         3ad639fff73e56f3b09dd20c335478d6
+yuv444p16le         8a7e66dc91ab7971fd24a9105ff2699b
 yuva420p            a29884f3f3dfe1e00b961bc17bef3d47
 yuvj420p            32eec78ba51857b16ce9b813a49b7189
 yuvj422p            0dfa0ed434f73be51428758c69e082cb
diff --git a/tests/ref/lavfi/pixfmts_crop b/tests/ref/lavfi/pixfmts_crop
index e3bb88c101..d11720f83c 100644
--- a/tests/ref/lavfi/pixfmts_crop
+++ b/tests/ref/lavfi/pixfmts_crop
@@ -1,8 +1,8 @@
 abgr                cd761690872843d1b7ab0c695393c751
 argb                2ec6ef18769bcd651c2e8904d5a3ee67
 bgr24               3450fd00cf1493d1ded75544d82ba3ec
-bgr48be             a9a7d177cef0914d3f1d266f00dff676
-bgr48le             b475d1b529ed80c728ddbacd22d35281
+bgr48be             18ca4002732f278cc9f525215c2fca41
+bgr48le             395a4c187c4e95217d089bd3df9f3654
 bgr4_byte           2f6ac3cdd4676ab4e2982bdf0664945b
 bgr555be            d3a7c273604723adeb7e5f5dd1c4272b
 bgr555le            d22442fc13b464f9ba455b08df4e981f
@@ -14,8 +14,8 @@ gray                8c4850e66562a587a292dc728a65ea4a
 gray16be            daa5a6b98fb4a280c57c57bff1a2ab5a
 gray16le            84f5ea7259073edcb893113b42213c8e
 rgb24               3b90ed64b687d3dc186c6ef521dc71a8
-rgb48be             b8f9fd6aaa24d75275ee2f8b8a7b9e55
-rgb48le             3e52e831a040f086c3ae983241172cce
+rgb48be             e6fd353c0eb9bea889423954414bea35
+rgb48le             68a1723da11ce08b502d42e204376503
 rgb4_byte           6958029f73c6cdfed4f71020d816f027
 rgb555be            41a7d1836837bc90f2cae19a9c9df3b3
 rgb555le            eeb78f8ce6186fba55c941469e60ba67
@@ -29,12 +29,12 @@ yuv420p             bfea0188ddd4889787c403caae119cc7
 yuv420p16be         8365eff38b8c329aeb95fc605fa229bb
 yuv420p16le         5e8dd38d973d5854abe1ad4efad20cc1
 yuv422p             f2f930a91fe00d4252c4720b5ecd8961
-yuv422p16be         93f9b6f33f9529db6de6a9f0ddd70eb5
-yuv422p16le         2e66dcfec54ca6b57aa4bbd9ac234639
+yuv422p16be         167e4338811a7d272925a4c6417d60da
+yuv422p16le         3359395d5875d581fa1e975013d30114
 yuv440p             2472417d980e395ad6843cbb8b633b29
 yuv444p             1f151980486848c96bc5585ced99003e
-yuv444p16be         e7d1ecf0c11a41b5db192f761f55bd3c
-yuv444p16le         3298a0043d982e7cf1a33a1292fa11f0
+yuv444p16be         5d0c0ea66ab43c0c590d8c2a9256e43f
+yuv444p16le         3c0a747c1b64feb0ab8dfba92f92579a
 yuva420p            7536753dfbc7932560fb50c921369a0e
 yuvj420p            21f891093006d42d7683b0e1d773a657
 yuvj422p            9a43d474c407590ad8f213880586b45e
diff --git a/tests/ref/lavfi/pixfmts_hflip b/tests/ref/lavfi/pixfmts_hflip
index 2084d581e1..5eb1b31140 100644
--- a/tests/ref/lavfi/pixfmts_hflip
+++ b/tests/ref/lavfi/pixfmts_hflip
@@ -1,8 +1,8 @@
 abgr                49468c6c9ceee5d52b08b1270a909323
 argb                50ba9f16c6475530602f2983278b82d0
 bgr24               cc53d2011d097972db0d22756c3699e3
-bgr48be             90374bc92471f1bd4931d71ef8b73f50
-bgr48le             696f628d0dd32121e60a0d61ac47d6e6
+bgr48be             815192d3757c66de97b0d51818acbe0f
+bgr48le             8e4184ac6eae251b4bace51dba7d790c
 bgr4_byte           aac987e7d1a6a96477cfc0b48a4285de
 bgr555be            bc07265898440116772200390d70c092
 bgr555le            ccee08679bac84a1f960c6c9070c5538
@@ -14,8 +14,8 @@ gray                03efcb4ab52a24c0af0e03cfd26c9377
 gray16be            9bcbca979601ddc4869f846f08f3d1dd
 gray16le            c1b8965adcc7f847ee343149ff507073
 rgb24               754f1722fc738590cc407ac65749bfe8
-rgb48be             2397b9d3c296ac15f8a2325a703f81c7
-rgb48le             527043c72546d8b4bb1ce2dea4b294c3
+rgb48be             d690412ca5fada031b5da47b87096248
+rgb48le             c901feb564232f5d0bc0eabd66dae3e7
 rgb4_byte           c8a3f995fcf3e0919239ea2c413ddc29
 rgb555be            045ce8607d3910586f4d97481dda8632
 rgb555le            8778ee0cf58ce9ad1d99a1eca9f95e87
@@ -29,12 +29,12 @@ yuv420p             2d5c80f9ba2ddd85b2aeda3564cc7d64
 yuv420p16be         758b0c1e2113b15e7afde48da4e4d024
 yuv420p16le         480ccd951dcb806bc875d307e02e50a0
 yuv422p             6e728f4eb9eae287c224f396d84be6ea
-yuv422p16be         8657d2c8d443940300fdb4028d555631
-yuv422p16le         4ab27609981e50de5b1150125718ae76
+yuv422p16be         69cf0605496c321546899a8442ee64fb
+yuv422p16le         f0b443fea72f4b6f462859a73b159664
 yuv440p             a99e2b57ed601f39852715c9d675d0d3
 yuv444p             947e47f7bb5fdccc659d19b7df2b6fc3
-yuv444p16be         a5154ce329db0d2caf0bd43f1347dba3
-yuv444p16le         1f703308b90feb048191b3bccc695671
+yuv444p16be         bc7d53923cff1d7e98d24540845fb64b
+yuv444p16le         5df206a93f85ef8b77f5bdc81d9b0a0b
 yuva420p            d83ec0c01498189f179ec574918185f1
 yuvj420p            df3aaaec3bb157c3bde5f0365af30f4f
 yuvj422p            d113871528d510a192797af59df9c05c
diff --git a/tests/ref/lavfi/pixfmts_null b/tests/ref/lavfi/pixfmts_null
index 35e08a6ac7..879314f23d 100644
--- a/tests/ref/lavfi/pixfmts_null
+++ b/tests/ref/lavfi/pixfmts_null
@@ -1,8 +1,8 @@
 abgr                037bf9df6a765520ad6d490066bf4b89
 argb                c442a8261c2265a07212ef0f72e35f5a
 bgr24               0d0cb38ab3fa0b2ec0865c14f78b217b
-bgr48be             74dedaaacae8fd1ef46e05f78cf29d62
-bgr48le             0eb7d30801eac6058814bddd330b3c76
+bgr48be             00624e6c7ec7ab19897ba2f0a3257fe8
+bgr48le             d02c235ebba7167881ca2d576497ff84
 bgr4_byte           50d23cc82d9dcef2fd12adb81fb9b806
 bgr555be            49f01b1f1f0c84fd9e776dd34cc3c280
 bgr555le            378d6ac4223651a1adcbf94a3d0d807b
@@ -18,8 +18,8 @@ monow               9251497f3b0634f1165d12d5a289d943
 nv12                e0af357888584d36eec5aa0f673793ef
 nv21                9a3297f3b34baa038b1f37cb202b512f
 rgb24               b41eba9651e1b5fe386289b506188105
-rgb48be             e3bc84c9af376fb6d0f0293cc7b713a6
-rgb48le             f51c0e71638a822458329abb2f4052c7
+rgb48be             cc139ec1dd9451f0e049c0cb3a0c8aa2
+rgb48le             86c5608904f75360d492dbc5c9589969
 rgb4_byte           c93ba89b74c504e7f5ae9d9ab1546c73
 rgb555be            912a62c5e53bfcbac2a0340e10973cf2
 rgb555le            a937a0fc764fb57dc1b3af87cba0273c
@@ -40,12 +40,12 @@ yuv420p9le          16543fda8f87d94a6cf857d2e8d4461a
 yuv422p             c9bba4529821d796a6ab09f6a5fd355a
 yuv422p10be         bdc13b630fd668b34c6fe1aae28dfc71
 yuv422p10le         d0607c260a45c973e6639f4e449730ad
-yuv422p16be         dc9886f2fccf87cc54b27e071a2c251e
-yuv422p16le         f181c8d8436f1233ba566d9bc88005ec
+yuv422p16be         4e9b3b3467aeebb6a528cee5966800ed
+yuv422p16le         f87c81bf16916b64d201359be0b4b6f4
 yuv440p             5a064afe2b453bb52cdb3f176b1aa1cf
 yuv444p             0a98447b78fd476aa39686da6a74fa2e
-yuv444p16be         af555dbaa401b142a995566864f47545
-yuv444p16le         a803e8016997dad95c5b2a72f54c34d6
+yuv444p16be         3ad639fff73e56f3b09dd20c335478d6
+yuv444p16le         8a7e66dc91ab7971fd24a9105ff2699b
 yuva420p            a29884f3f3dfe1e00b961bc17bef3d47
 yuvj420p            32eec78ba51857b16ce9b813a49b7189
 yuvj422p            0dfa0ed434f73be51428758c69e082cb
diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale
index 15f63b3c4f..7032ecb965 100644
--- a/tests/ref/lavfi/pixfmts_scale
+++ b/tests/ref/lavfi/pixfmts_scale
@@ -1,8 +1,8 @@
 abgr                cff82561a074874027ac1cc896fd2730
 argb                756dd1eaa5baca2238ce23dbdc452684
 bgr24               e44192347a45586c6c157e3059610cd1
-bgr48be             07f7a0cc34feb3646434d47c0cec8cee
-bgr48le             9abd2c3a66088e6c9078232064eba61e
+bgr48be             390d3058a12a99c2b153ed7922508bea
+bgr48le             39fe06feb4ec1d9730dccc04a0cfac4c
 bgr4_byte           ee1d35a7baf8e9016891929a2f565c0b
 bgr555be            6a2d335856db12e3ea72173d71610e21
 bgr555le            41e3e0961478dc634bf68a7bbd670cc9
@@ -18,8 +18,8 @@ monow               fd5d417ab7728acddffc06870661df61
 nv12                4676d59db43d657dc12841f6bc3ab452
 nv21                69c699510ff1fb777b118ebee1002f14
 rgb24               13ff53ebeab74dc05492836f1cfbd2c1
-rgb48be             f18841c19fc6d9c817a3095f557b9bc5
-rgb48le             819e7b8acd8965ba57ba46198a5cc9bf
+rgb48be             8fac63787a711886030f8e056872b488
+rgb48le             ab92f2763a2eb264c3870cc758f97149
 rgb4_byte           d81ffd3add95842a618eec81024f0b5c
 rgb555be            491dc49ff83258ffe415289bdcfb50b2
 rgb555le            bd698d86c03170c4a16607c0fd1f750f
@@ -40,12 +40,12 @@ yuv420p9le          a7b131a7dd06906a5aef2e36d117b972
 yuv422p             918e37701ee7377d16a8a6c119c56a40
 yuv422p10be         35206fcd7e00ee582a8c366b37d57d1d
 yuv422p10le         396f930e2da02f149ab9dd5b781cbe8d
-yuv422p16be         2cf502d7d386db1f1b3b946679d897b1
-yuv422p16le         3002a4e47520731dcee5929aff49eb74
+yuv422p16be         285993ee0c0f4f8e511ee46f93c5f38c
+yuv422p16le         61bfcee8e54465f760164f5a75d40b5e
 yuv440p             461503fdb9b90451020aa3b25ddf041c
 yuv444p             81b2eba962d12e8d64f003ac56f6faf2
-yuv444p16be         b9f051ce7335923fe33efd162e48da1d
-yuv444p16le         fa47e317efac988b4a7fa55141c89126
+yuv444p16be         2677f3074d255f9dab625e9e2e092ca5
+yuv444p16le         65fa92521ef97088599ea83f9508cd5b
 yuva420p            8673a9131fb47de69788863f93a50eb7
 yuvj420p            30427bd6caf5bda93a173dbebe759e09
 yuvj422p            fc8288f64fd149573f73cf8da05d8e6d
diff --git a/tests/ref/lavfi/pixfmts_vflip b/tests/ref/lavfi/pixfmts_vflip
index 44f1c131db..6f51dc7dd7 100644
--- a/tests/ref/lavfi/pixfmts_vflip
+++ b/tests/ref/lavfi/pixfmts_vflip
@@ -1,8 +1,8 @@
 abgr                25e72e9dbd01ab00727c976d577f7be5
 argb                19869bf1a5ac0b6af4d8bbe2c104533c
 bgr24               89108a4ba00201f79b75b9305c42352d
-bgr48be             908b4edb525fd154a95a3744c4ab5420
-bgr48le             796c2072d6fa13a091f5c5b175417ed5
+bgr48be             2f23931844f57641f3737348182d118c
+bgr48le             4242a026012b6c135a6aa138a6d67031
 bgr4_byte           407fcf564ed764c38e1d748f700ab921
 bgr555be            f739d2519f7e9d494359bf67a3821537
 bgr555le            bd7b3ec4d684dfad075d89a606cb8b74
@@ -18,8 +18,8 @@ monow               ff9869d067ecb94eb9d90c9750c31fea
 nv12                046f00f598ce14d9854a3534a5c99114
 nv21                01ea369dd2d0d3ed7451dc5c8d61497f
 rgb24               eaefabc168d0b14576bab45bc1e56e1e
-rgb48be             8e347deca2902e7dc1ece261322577d8
-rgb48le             2034e485f946e4064b5fb9be09865e55
+rgb48be             62dd185862ed142283bd300eb6dbd216
+rgb48le             dcb76353268bc5862194d131762220da
 rgb4_byte           8c6ff02df0b06dd2d574836c3741b2a2
 rgb555be            40dc33cfb5cf56aac1c5a290ac486c36
 rgb555le            4f8eaad29a17e0f8e9d8ab743e76b999
@@ -40,12 +40,12 @@ yuv420p9le          7e606310d3f5ff12badf911e8f333471
 yuv422p             d7f5cb44d9b0210d66d6a8762640ab34
 yuv422p10be         588fe319b96513c32e21d3e32b45447f
 yuv422p10le         11b57f2bd9661024153f3973b9090cdb
-yuv422p16be         51d9aa4e78d121c226d919ce97976fe4
-yuv422p16le         12965c54bda8932ca72da194419a9908
+yuv422p16be         c092d083548c2a144c372a98c46875c7
+yuv422p16le         c071b9397a416d51cbe339345cbcba84
 yuv440p             876385e96165acf51271b20e5d85a416
 yuv444p             9c3c667d1613b72d15bc6d851c5eb8f7
-yuv444p16be         6502abd75030d462c58d99a8673ec517
-yuv444p16le         cd7e88b6d08425450a57555bc86ab210
+yuv444p16be         6a954614fd2a8ae0df53e4fd76937af8
+yuv444p16le         65613965fb58cc4c3cd480a68b6540ea
 yuva420p            c705d1cf061d8c6580ac690b55f92276
 yuvj420p            41fd02b204da0ab62452cd14b595e2e4
 yuvj422p            7f6ca9bc1812cde02036d7d29a7cce43
diff --git a/tests/ref/vsynth1/dnxhd_720p_10bit b/tests/ref/vsynth1/dnxhd_720p_10bit
index b307050338..cdab77c16a 100644
--- a/tests/ref/vsynth1/dnxhd_720p_10bit
+++ b/tests/ref/vsynth1/dnxhd_720p_10bit
@@ -1,4 +1,4 @@
 cb29b6ae4e1562d95f9311991fef98df *./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd
-2293760 ./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd
+ 2293760 ./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd
 2f45bb1af7da5dd3dca870ac87237b7d *./tests/data/dnxhd_720p_10bit.vsynth1.out.yuv
 stddev:    6.27 PSNR: 32.18 MAXDIFF:   64 bytes:   760320/  7603200
diff --git a/tests/ref/vsynth2/dnxhd_720p_10bit b/tests/ref/vsynth2/dnxhd_720p_10bit
index df30f67368..81f53d8353 100644
--- a/tests/ref/vsynth2/dnxhd_720p_10bit
+++ b/tests/ref/vsynth2/dnxhd_720p_10bit
@@ -1,4 +1,4 @@
 8648511257afb816b5b911706ca391db *./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd
-2293760 ./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd
+ 2293760 ./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd
 391b6f5aa7c7b488b479cb43d420b860 *./tests/data/dnxhd_720p_10bit.vsynth2.out.yuv
 stddev:    1.35 PSNR: 45.46 MAXDIFF:   23 bytes:   760320/  7603200