aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-04-12 22:43:03 +0000
committerDiego Biurrun <diego@biurrun.de>2009-04-12 22:43:03 +0000
commit457eed7204d613f6a4e6bfbf67508de6a800e25a (patch)
tree06048252f45416e3f01e80b66dcb1270849c7fb5
parent8bf7a510b92695e4ef4dc26e3b039049e6ddcbd9 (diff)
downloadffmpeg-457eed7204d613f6a4e6bfbf67508de6a800e25a.tar.gz
whitespace cosmetics: Reindent a few lines and break a few excessively long lines.
Originally committed as revision 29174 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
-rw-r--r--libswscale/swscale_internal.h27
1 files changed, 15 insertions, 12 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 070161900b..4b16381001 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -54,8 +54,9 @@
struct SwsContext;
-typedef int (*SwsFunc)(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY,
- int srcSliceH, uint8_t* dst[], int dstStride[]);
+typedef int (*SwsFunc)(struct SwsContext *context, uint8_t* src[],
+ int srcStride[], int srcSliceY, int srcSliceH,
+ uint8_t* dst[], int dstStride[]);
/* This struct should be aligned on at least a 32-byte boundary. */
typedef struct SwsContext{
@@ -183,7 +184,6 @@ typedef struct SwsContext{
int32_t alpMmxFilter[4*MAX_FILTER_SIZE];
#if HAVE_ALTIVEC
-
vector signed short CY;
vector signed short CRV;
vector signed short CBU;
@@ -192,10 +192,8 @@ typedef struct SwsContext{
vector signed short OY;
vector unsigned short CSHIFT;
vector signed short *vYCoeffsBank, *vCCoeffsBank;
-
#endif
-
#if ARCH_BFIN
uint32_t oy __attribute__((aligned(4)));
uint32_t oc __attribute__((aligned(4)));
@@ -260,18 +258,23 @@ typedef struct SwsContext{
const uint8_t *src, int srcW, int xInc);
void (*hcscale_fast)(struct SwsContext *c,
int16_t *dst, int dstWidth,
- const uint8_t *src1, const uint8_t *src2, int srcW, int xInc);
+ const uint8_t *src1, const uint8_t *src2,
+ int srcW, int xInc);
void (*hScale)(int16_t *dst, int dstW, const uint8_t *src, int srcW,
- int xInc, const int16_t *filter, const int16_t *filterPos, long filterSize);
+ int xInc, const int16_t *filter, const int16_t *filterPos,
+ long filterSize);
} SwsContext;
//FIXME check init (where 0)
SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c);
-int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int fullRange, int brightness, int contrast, int saturation);
+int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4],
+ int fullRange, int brightness,
+ int contrast, int saturation);
-void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4], int brightness, int contrast, int saturation);
+void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4],
+ int brightness, int contrast, int saturation);
SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c);
SwsFunc ff_yuv2rgb_init_vis(SwsContext *c);
SwsFunc ff_yuv2rgb_init_mlib(SwsContext *c);
@@ -279,9 +282,9 @@ SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c);
SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c);
void ff_bfin_get_unscaled_swscale(SwsContext *c);
void ff_yuv2packedX_altivec(SwsContext *c,
- int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize,
- int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize,
- uint8_t *dest, int dstW, int dstY);
+ int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize,
+ int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize,
+ uint8_t *dest, int dstW, int dstY);
const char *sws_format_name(int format);