diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-15 22:27:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-15 23:31:51 +0200 |
| commit | 35e0496a7bb7243ce3574ab971bd489c7f7a0876 (patch) | |
| tree | 3c6145906ffd6f4342c9b41d17af6ec78b7e94ad /libswscale/output.c | |
| parent | 88a97d660d65b8d5ac2ca719969c0096ace00114 (diff) | |
| parent | 3892e784f2225b32c87a5996347994f108fbd369 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Improve suggested Emacs settings for our coding style.
utvideo: Remove unused variable 'src_size'
mov: free memory on header parsing failure
mov: fix leaking memory with multiple drefs.
swscale: clip before assigning tables in RGB output functions.
swscale: fix off-by-one in second coefficient in bilinear filters.
Conflicts:
libavformat/mov.c
libswscale/output.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/output.c')
| -rw-r--r-- | libswscale/output.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libswscale/output.c b/libswscale/output.c index 0e5b3f8802..e431441379 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -356,7 +356,7 @@ yuv2mono_2_c_template(SwsContext *c, const int16_t *buf[2], { const int16_t *buf0 = buf[0], *buf1 = buf[1]; const uint8_t * const d128 = dither_8x8_220[y & 7]; - int yalpha1 = 4095 - yalpha; + int yalpha1 = 4096 - yalpha; int i; for (i = 0; i < dstW; i += 8) { @@ -508,8 +508,8 @@ yuv2422_2_c_template(SwsContext *c, const int16_t *buf[2], const int16_t *buf0 = buf[0], *buf1 = buf[1], *ubuf0 = ubuf[0], *ubuf1 = ubuf[1], *vbuf0 = vbuf[0], *vbuf1 = vbuf[1]; - int yalpha1 = 4095 - yalpha; - int uvalpha1 = 4095 - uvalpha; + int yalpha1 = 4096 - yalpha; + int uvalpha1 = 4096 - uvalpha; int i; for (i = 0; i < ((dstW + 1) >> 1); i++) { @@ -667,8 +667,8 @@ yuv2rgb48_2_c_template(SwsContext *c, const int32_t *buf[2], const int32_t *buf0 = buf[0], *buf1 = buf[1], *ubuf0 = ubuf[0], *ubuf1 = ubuf[1], *vbuf0 = vbuf[0], *vbuf1 = vbuf[1]; - int yalpha1 = 4095 - yalpha; - int uvalpha1 = 4095 - uvalpha; + int yalpha1 = 4096 - yalpha; + int uvalpha1 = 4096 - uvalpha; int i; for (i = 0; i < ((dstW + 1) >> 1); i++) { @@ -1008,8 +1008,8 @@ yuv2rgb_2_c_template(SwsContext *c, const int16_t *buf[2], *vbuf0 = vbuf[0], *vbuf1 = vbuf[1], *abuf0 = hasAlpha ? abuf[0] : NULL, *abuf1 = hasAlpha ? abuf[1] : NULL; - int yalpha1 = 4095 - yalpha; - int uvalpha1 = 4095 - uvalpha; + int yalpha1 = 4096 - yalpha; + int uvalpha1 = 4096 - uvalpha; int i; for (i = 0; i < ((dstW + 1) >> 1); i++) { |