From c60f68724c96137e06afded2e3f5be028f7ac180 Mon Sep 17 00:00:00 2001 From: stefano Date: Sun, 17 Jan 2010 23:17:47 +0000 Subject: Remove duplicated or pointless newlines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30361 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index a2a8c83a7a..893637be8a 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -771,7 +771,6 @@ static inline void yuv2nv12XinC(const int16_t *lumFilter, const int16_t **lumSrc dest++;\ }\ - #define YSCALE_YUV_2_MONOX_C \ const uint8_t * const d128=dither_8x8_220[y&7];\ uint8_t *g= c->table_gU[128] + c->table_gV[128];\ @@ -801,7 +800,6 @@ static inline void yuv2nv12XinC(const int16_t *lumFilter, const int16_t **lumSrc }\ } - #define YSCALE_YUV_2_ANYRGB_C(func, func2, func_g16, func_monoblack)\ switch(c->dstFormat) {\ case PIX_FMT_RGB48BE:\ @@ -991,7 +989,6 @@ static inline void yuv2nv12XinC(const int16_t *lumFilter, const int16_t **lumSrc break;\ }\ - static inline void yuv2packedXinC(SwsContext *c, const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize, const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize, const int16_t **alpSrc, uint8_t *dest, int dstW, int y) @@ -1249,7 +1246,6 @@ static inline void monoblack2Y(uint8_t *dst, const uint8_t *src, long width, uin } } - //Note: we have C, MMX, MMX2, 3DNOW versions, there is no 3DNOW+MMX2 one //Plain C versions #if ((!HAVE_MMX || !CONFIG_GPL) && !HAVE_ALTIVEC) || CONFIG_RUNTIME_CPUDETECT @@ -1624,7 +1620,6 @@ static int initFilter(int16_t **outFilter, int16_t **filterPos, int *outFilterSi } } - //FIXME try to align filterPos if possible //fix borders @@ -2135,7 +2130,6 @@ static int rgb2rgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], static int bgr24toyv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) { - rgb24toyv12( src[0], dst[0]+ srcSliceY *dstStride[0], @@ -2269,7 +2263,6 @@ static int planarCopy(SwsContext *c, const uint8_t* src[], int srcStride[], int return srcSliceH; } - static void getSubSampleFactors(int *h, int *v, enum PixelFormat format) { *h = av_pix_fmt_descriptors[format].log2_chroma_w; @@ -2719,8 +2712,6 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d } } // initialize horizontal stuff - - /* precalculate vertical scaler filter coefficients */ { const int filterAlign= @@ -2988,7 +2979,6 @@ int sws_scale(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSlice v= av_clip_uint8((RV*r + GV*g + BV*b + (257<<(RGB2YUV_SHIFT-1)))>>RGB2YUV_SHIFT); c->pal_yuv[i]= y + (u<<8) + (v<<16); - switch(c->dstFormat) { case PIX_FMT_BGR32: #if !HAVE_BIGENDIAN @@ -3172,7 +3162,6 @@ SwsVector *sws_getConstVec(double c, int length) return vec; } - SwsVector *sws_getIdentityVec(void) { return sws_getConstVec(1.0, 1); @@ -3365,7 +3354,6 @@ void sws_freeFilter(SwsFilter *filter) av_free(filter); } - void sws_freeContext(SwsContext *c) { int i; -- cgit v1.2.3