diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-11 03:22:39 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-11 03:22:39 +0000 |
| commit | bdf397ba4baa1fe4605527d26d3d2e4b66eb0fbc (patch) | |
| tree | 0f0dc04de551243fb3ec5ff91f52f6be974db318 /libswscale/swscale.c | |
| parent | e69bd29425eb26258e6eb7f1dcd521c341232c58 (diff) | |
Do not do unneeded cliping in YSCALE_YUV_2_PACKEDX_C.
Originally committed as revision 27579 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index e2b997ca19..a1b0497f14 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -434,7 +434,7 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil } } -#define YSCALE_YUV_2_PACKEDX_C(type) \ +#define YSCALE_YUV_2_PACKEDX_NOCLIP_C(type) \ for (i=0; i<(dstW>>1); i++){\ int j;\ int Y1 = 1<<18;\ @@ -458,6 +458,9 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil Y2>>=19;\ U >>=19;\ V >>=19;\ + +#define YSCALE_YUV_2_PACKEDX_C(type) \ + YSCALE_YUV_2_PACKEDX_NOCLIP_C(type)\ if ((Y1|Y2|U|V)&256)\ {\ if (Y1>255) Y1=255; \ @@ -496,7 +499,7 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil } #define YSCALE_YUV_2_RGBX_C(type) \ - YSCALE_YUV_2_PACKEDX_C(type) \ + YSCALE_YUV_2_PACKEDX_NOCLIP_C(type) \ r = (type *)c->table_rV[V]; \ g = (type *)(c->table_gU[U] + c->table_gV[V]); \ b = (type *)c->table_bU[U]; \ |