summaryrefslogtreecommitdiff
path: root/src/libffmpeg
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-11-30 21:24:21 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-11-30 21:24:21 +0000
commitadd0bcc4c9191cb8980d0b6935ca5d51a9928d82 (patch)
tree1ef3c98b5183a299107193ceca9135e9f3c57bfc /src/libffmpeg
parent6d410af50e98533e07dd8ebb8fdd3870192f8a73 (diff)
downloadxine-lib-add0bcc4c9191cb8980d0b6935ca5d51a9928d82.tar.gz
xine-lib-add0bcc4c9191cb8980d0b6935ca5d51a9928d82.tar.bz2
Trim trailing space & reduce space+tab.
Diffstat (limited to 'src/libffmpeg')
-rw-r--r--src/libffmpeg/libavcodec/Makefile.am2
-rw-r--r--src/libffmpeg/libavcodec/armv4l/Makefile.am2
-rw-r--r--src/libffmpeg/libavcodec/i386/dsputil_mmx.c6
-rw-r--r--src/libffmpeg/libavcodec/libpostproc/Makefile.am2
-rw-r--r--src/libffmpeg/libavcodec/swscale.h12
5 files changed, 12 insertions, 12 deletions
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index a5e6cd650..09c539b62 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -123,7 +123,7 @@ libavcodec_la_SOURCES = \
wnv1.c \
xan.c \
xl.c \
- zmbv.c
+ zmbv.c
libavcodec_la_LDFLAGS = \
$(top_builddir)/src/libffmpeg/libavcodec/armv4l/libavcodec_armv4l.la \
diff --git a/src/libffmpeg/libavcodec/armv4l/Makefile.am b/src/libffmpeg/libavcodec/armv4l/Makefile.am
index 33e0882c9..38979bc95 100644
--- a/src/libffmpeg/libavcodec/armv4l/Makefile.am
+++ b/src/libffmpeg/libavcodec/armv4l/Makefile.am
@@ -18,6 +18,6 @@ EXTRA_DIST = $(libavcodec_armv4l_src) $(libavcodec_armv4l_dummy)
#if HAVE_ARMV4L
#armv4l_modules = $(libavcodec_armv4l_src)
#endif
-armv4l_modules =
+armv4l_modules =
libavcodec_armv4l_la_SOURCES = $(armv4l_modules) $(libavcodec_armv4l_dummy)
diff --git a/src/libffmpeg/libavcodec/i386/dsputil_mmx.c b/src/libffmpeg/libavcodec/i386/dsputil_mmx.c
index 673e749c4..27c0c678c 100644
--- a/src/libffmpeg/libavcodec/i386/dsputil_mmx.c
+++ b/src/libffmpeg/libavcodec/i386/dsputil_mmx.c
@@ -2566,17 +2566,17 @@ static void gmc_mmx(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int o
"psrlw %5, %%mm0 \n\t"
"packuswb %%mm0, %%mm0 \n\t"
- :
+ :
: "m"(src[0]), "m"(src[1]),
"m"(src[stride]), "m"(src[stride+1]),
"m"(*r4), "m"(shift2)
);
-
+
asm volatile(
"movd %%mm0, %0 \n\t"
: "=m"(dst[x+y*stride])
- :
+ :
);
src += stride;
}
diff --git a/src/libffmpeg/libavcodec/libpostproc/Makefile.am b/src/libffmpeg/libavcodec/libpostproc/Makefile.am
index 66bd17e53..a047bb8cd 100644
--- a/src/libffmpeg/libavcodec/libpostproc/Makefile.am
+++ b/src/libffmpeg/libavcodec/libpostproc/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/misc/Makefile.common
# -fomit-frame-pointer is always needed. it might cause debug to not
# work, but at least it compiles.
AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing
-AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavcodec
+AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavcodec
# Avoid errors with -O0
postprocess.o postprocess.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-O0\?\s/-Os /g'`
diff --git a/src/libffmpeg/libavcodec/swscale.h b/src/libffmpeg/libavcodec/swscale.h
index 06088b8e4..d3b430f84 100644
--- a/src/libffmpeg/libavcodec/swscale.h
+++ b/src/libffmpeg/libavcodec/swscale.h
@@ -23,7 +23,7 @@
/**
* @file swscale.h
- * @brief
+ * @brief
* external api for the swscale stuff
*/
@@ -76,12 +76,12 @@ extern "C" {
#define SWS_MAX_REDUCE_CUTOFF 0.002
#define SWS_CS_ITU709 1
-#define SWS_CS_FCC 4
+#define SWS_CS_FCC 4
#define SWS_CS_ITU601 5
#define SWS_CS_ITU624 5
-#define SWS_CS_SMPTE170M 5
-#define SWS_CS_SMPTE240M 7
-#define SWS_CS_DEFAULT 5
+#define SWS_CS_SMPTE170M 5
+#define SWS_CS_SMPTE240M 7
+#define SWS_CS_DEFAULT 5
@@ -128,7 +128,7 @@ SwsVector *sws_cloneVec(SwsVector *a);
void sws_printVec(SwsVector *a);
void sws_freeVec(SwsVector *a);
-SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,
+SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,
float lumaSarpen, float chromaSharpen,
float chromaHShift, float chromaVShift,
int verbose);