[FFmpeg-cvslog] sws: remove nonsensical code that leaked in from libav
Michael Niedermayer
git at videolan.org
Sun Oct 23 19:38:31 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 23 14:01:32 2011 +0200| [b1a4b735f9b03840803413cb725216d15d5213a7] | committer: Michael Niedermayer
sws: remove nonsensical code that leaked in from libav
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1a4b735f9b03840803413cb725216d15d5213a7
---
libswscale/swscale.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 1e69e97..96f2922 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
More information about the ffmpeg-cvslog
mailing list