Browse Source
swscale: fix conversion into yuva444p from non-alpha formats
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n0.11
Paul B Mahol
Michael Niedermayer
13 years ago
6 changed files with 6 additions and 6 deletions
Unified View
Diff Options
-
+1 -1libswscale/swscale.c
-
+1 -1tests/ref/lavfi/pixdesc
-
+1 -1tests/ref/lavfi/pixfmts_copy
-
+1 -1tests/ref/lavfi/pixfmts_null
-
+1 -1tests/ref/lavfi/pixfmts_scale
-
+1 -1tests/ref/lavfi/pixfmts_vflip
+ 1
- 1
libswscale/swscale.c
View File
| @@ -2804,7 +2804,7 @@ static int swScale(SwsContext *c, const uint8_t* src[], | |||||
| } | } | ||||
| } | } | ||||
| if ((dstFormat == PIX_FMT_YUVA420P) && !alpPixBuf) | |||||
| if (isPlanarYUV(dstFormat) && isALPHA(dstFormat) && !alpPixBuf) | |||||
| fillPlane(dst[3], dstStride[3], dstW, dstY-lastDstY, lastDstY, 255); | fillPlane(dst[3], dstStride[3], dstW, dstY-lastDstY, lastDstY, 255); | ||||
| #if HAVE_MMX2 | #if HAVE_MMX2 | ||||
+ 1
- 1
tests/ref/lavfi/pixdesc
View File
| @@ -61,7 +61,7 @@ yuv444p16le 20f86bc2f68d2b3f1f2b48b97b2189f4 | |||||
| yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 | yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 | ||||
| yuv444p9le f0606604a5c08becab6ba500124c4b7c | yuv444p9le f0606604a5c08becab6ba500124c4b7c | ||||
| yuva420p a29884f3f3dfe1e00b961bc17bef3d47 | yuva420p a29884f3f3dfe1e00b961bc17bef3d47 | ||||
| yuva444p f531f0aceeda53adfd2f89f2cb43488c | |||||
| yuva444p c523716e4900cfe515eaab1d7124fdd9 | |||||
| yuvj420p 32eec78ba51857b16ce9b813a49b7189 | yuvj420p 32eec78ba51857b16ce9b813a49b7189 | ||||
| yuvj422p 0dfa0ed434f73be51428758c69e082cb | yuvj422p 0dfa0ed434f73be51428758c69e082cb | ||||
| yuvj440p 657501a28004e27a592757a7509f5189 | yuvj440p 657501a28004e27a592757a7509f5189 | ||||
+ 1
- 1
tests/ref/lavfi/pixfmts_copy
View File
| @@ -62,7 +62,7 @@ yuv444p16le 20f86bc2f68d2b3f1f2b48b97b2189f4 | |||||
| yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 | yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 | ||||
| yuv444p9le f0606604a5c08becab6ba500124c4b7c | yuv444p9le f0606604a5c08becab6ba500124c4b7c | ||||
| yuva420p a29884f3f3dfe1e00b961bc17bef3d47 | yuva420p a29884f3f3dfe1e00b961bc17bef3d47 | ||||
| yuva444p f531f0aceeda53adfd2f89f2cb43488c | |||||
| yuva444p c523716e4900cfe515eaab1d7124fdd9 | |||||
| yuvj420p 32eec78ba51857b16ce9b813a49b7189 | yuvj420p 32eec78ba51857b16ce9b813a49b7189 | ||||
| yuvj422p 0dfa0ed434f73be51428758c69e082cb | yuvj422p 0dfa0ed434f73be51428758c69e082cb | ||||
| yuvj440p 657501a28004e27a592757a7509f5189 | yuvj440p 657501a28004e27a592757a7509f5189 | ||||
+ 1
- 1
tests/ref/lavfi/pixfmts_null
View File
| @@ -62,7 +62,7 @@ yuv444p16le 20f86bc2f68d2b3f1f2b48b97b2189f4 | |||||
| yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 | yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 | ||||
| yuv444p9le f0606604a5c08becab6ba500124c4b7c | yuv444p9le f0606604a5c08becab6ba500124c4b7c | ||||
| yuva420p a29884f3f3dfe1e00b961bc17bef3d47 | yuva420p a29884f3f3dfe1e00b961bc17bef3d47 | ||||
| yuva444p f531f0aceeda53adfd2f89f2cb43488c | |||||
| yuva444p c523716e4900cfe515eaab1d7124fdd9 | |||||
| yuvj420p 32eec78ba51857b16ce9b813a49b7189 | yuvj420p 32eec78ba51857b16ce9b813a49b7189 | ||||
| yuvj422p 0dfa0ed434f73be51428758c69e082cb | yuvj422p 0dfa0ed434f73be51428758c69e082cb | ||||
| yuvj440p 657501a28004e27a592757a7509f5189 | yuvj440p 657501a28004e27a592757a7509f5189 | ||||
+ 1
- 1
tests/ref/lavfi/pixfmts_scale
View File
| @@ -62,7 +62,7 @@ yuv444p16le a0c5d3c7bf3f181db503cf8e450d1335 | |||||
| yuv444p9be 9ac2643ce7f7e5c4e17c8c9fd8494d4a | yuv444p9be 9ac2643ce7f7e5c4e17c8c9fd8494d4a | ||||
| yuv444p9le 896a1cc9cccca1ba410dd53942d33cc4 | yuv444p9le 896a1cc9cccca1ba410dd53942d33cc4 | ||||
| yuva420p 8673a9131fb47de69788863f93a50eb7 | yuva420p 8673a9131fb47de69788863f93a50eb7 | ||||
| yuva444p 2d09fa4aaf1f6def1d41f0af78fe4433 | |||||
| yuva444p 3268c6abe5e3cdbd16552a1eddced816 | |||||
| yuvj420p 30427bd6caf5bda93a173dbebe759e09 | yuvj420p 30427bd6caf5bda93a173dbebe759e09 | ||||
| yuvj422p fc8288f64fd149573f73cf8da05d8e6d | yuvj422p fc8288f64fd149573f73cf8da05d8e6d | ||||
| yuvj440p 508ac7a9ddeb6d1794a1100ba7a1664c | yuvj440p 508ac7a9ddeb6d1794a1100ba7a1664c | ||||
+ 1
- 1
tests/ref/lavfi/pixfmts_vflip
View File
| @@ -62,7 +62,7 @@ yuv444p16le 8e83323cf102d6c823a03ae8a7b7e033 | |||||
| yuv444p9be 6ac92b7dc9ab2fc59bee99204886899a | yuv444p9be 6ac92b7dc9ab2fc59bee99204886899a | ||||
| yuv444p9le 85aef13a654953d3455d89770b0d74bd | yuv444p9le 85aef13a654953d3455d89770b0d74bd | ||||
| yuva420p c705d1cf061d8c6580ac690b55f92276 | yuva420p c705d1cf061d8c6580ac690b55f92276 | ||||
| yuva444p f374c860e711e8226105de8f02f08f3b | |||||
| yuva444p da5d64f2b2bd2013c186456f595fad65 | |||||
| yuvj420p 41fd02b204da0ab62452cd14b595e2e4 | yuvj420p 41fd02b204da0ab62452cd14b595e2e4 | ||||
| yuvj422p 7f6ca9bc1812cde02036d7d29a7cce43 | yuvj422p 7f6ca9bc1812cde02036d7d29a7cce43 | ||||
| yuvj440p 25711c3c0fd15ec19c59a10784fcfb96 | yuvj440p 25711c3c0fd15ec19c59a10784fcfb96 | ||||