diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2011-05-14 02:47:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-14 02:50:10 +0200 |
| commit | b025431bfee2f81a5a0a613f49cac354e4aa9dfa (patch) | |
| tree | a096ae99091c11628150a2a5a4aad844c6c8c9fc /libswscale | |
| parent | 58c03f6d7d6eabdbc25103e8229a06ddf3718bb9 (diff) | |
| download | ffmpeg-b025431bfee2f81a5a0a613f49cac354e4aa9dfa.tar.gz | |
swscale: 10l forgot git add this change from ronald.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index c727408687..d53af2771d 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -362,10 +362,11 @@ uint16_t dither_scale[15][16]={ static av_always_inline void yuv2yuvX16inC_template(const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize, const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize, const int16_t **alpSrc, uint16_t *dest, uint16_t *uDest, uint16_t *vDest, uint16_t *aDest, - int dstW, int chrDstW, int big_endian) + int dstW, int chrDstW, int big_endian, int output_bits) { //FIXME Optimize (just quickly written not optimized..) int i; + int shift = 11 + 16 - output_bits; #define output_pixel(pos, val) \ if (big_endian) { \ @@ -482,13 +483,13 @@ static inline void yuv2yuvX16inC(const int16_t *lumFilter, const int16_t **lumSr chrFilter, chrSrc, chrFilterSize, alpSrc, dest, uDest, vDest, aDest, - dstW, chrDstW, 1); + dstW, chrDstW, 1, 16); } else { yuv2yuvX16inC_template(lumFilter, lumSrc, lumFilterSize, chrFilter, chrSrc, chrFilterSize, alpSrc, dest, uDest, vDest, aDest, - dstW, chrDstW, 0); + dstW, chrDstW, 0, 16); } } } |