diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-23 14:01:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-23 19:22:58 +0200 |
| commit | b1a4b735f9b03840803413cb725216d15d5213a7 (patch) | |
| tree | 6ed47d14c1b81439a131b00f5893d7261bd4eadb /libswscale | |
| parent | 1c26f2da8123fc1b624b86cf5db8ec578f07b9e2 (diff) | |
sws: remove nonsensical code that leaked in from libav
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 1e69e97229..96f2922258 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -302,7 +302,8 @@ yuv2plane1_16_c_template(const int32_t *src, uint16_t *dest, int dstW, int big_endian, int output_bits) { int i; - int shift = 19 - output_bits; + int shift = 3; + av_assert0(output_bits == 16); for (i = 0; i < dstW; i++) { int val = src[i] + (1 << (shift - 1)); @@ -316,10 +317,11 @@ yuv2planeX_16_c_template(const int16_t *filter, int filterSize, int big_endian, int output_bits) { int i; - int shift = 15 + 16 - output_bits; + int shift = 15; + av_assert0(output_bits == 16); for (i = 0; i < dstW; i++) { - int val = 1 << (30-output_bits); + int val = 1 << (shift - 1); int j; /* range of val is [0,0x7FFFFFFF], so 31 bits, but with lanczos/spline |