diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-01-15 15:15:22 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-01-16 02:47:15 +0100 |
| commit | 2df7277711cbe3ca5415ff8e31228dcffa309211 (patch) | |
| tree | c8d9cba84e0116158c0a041c62386939c9d98764 | |
| parent | 89df3fd49e9992441f680326902b4912d79f514f (diff) | |
| download | ffmpeg-2df7277711cbe3ca5415ff8e31228dcffa309211.tar.gz | |
swscale: fix gbrap to gbrap alpha scaling
| -rw-r--r-- | libswscale/input.c | 5 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-scale | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index f575b7bfbd..e806bce661 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -596,12 +596,11 @@ static void planar_rgb_to_y(uint8_t *dst, const uint8_t *src[4], int width) } } -static void planar_rgb_to_a(uint8_t *_dst, const uint8_t *src[4], int width) +static void planar_rgb_to_a(uint8_t *dst, const uint8_t *src[4], int width) { - uint16_t *dst = (uint16_t *)_dst; int i; for (i = 0; i < width; i++) - dst[i] = src[3][i] << 6; + dst[i] = src[3][i]; } static void planar_rgb_to_uv(uint8_t *dstU, uint8_t *dstV, const uint8_t *src[4], int width) diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 712754cb2b..408644bae4 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -12,7 +12,7 @@ bgr565be 922a2503767036ae9536f4f7823c04ee bgr565le 3a514a298c6161a071ddf9963c06509d bgr8 7f007fa6c153a16e808a9c51605a4016 bgra a5e7040f9a80cccd65e5acf2ca09ace5 -gbrap 08ea11431bc436d788494d678b3edc6f +gbrap 7df4fd8da27245788cb422794e03acd4 gbrp 205c50f8359cb4ba2827a7711dea2cc6 gbrp10be 30b7f9d5ef5da474fb794743146236aa gbrp10le 2e9949a01fe4c38774728e34795165cc |