diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-11-25 13:51:05 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-11-25 13:51:05 +0000 |
| commit | 03ce9881c5988b462152200cd55853fd669df5ae (patch) | |
| tree | a622db957c214ee5ad1279530e0c3473f61d5242 /src | |
| parent | 783708a08de7d278d4fe1ebae4d0ea494fb35d81 (diff) | |
| download | xine-lib-03ce9881c5988b462152200cd55853fd669df5ae.tar.gz xine-lib-03ce9881c5988b462152200cd55853fd669df5ae.tar.bz2 | |
Some little cleanups.
CVS patchset: 1109
CVS date: 2001/11/25 13:51:05
Diffstat (limited to 'src')
| -rw-r--r-- | src/libffmpeg/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libffmpeg/config.h | 5 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/idct_mmx.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/bswap.h | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index d77e3ad04..ebcf60fbb 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -17,8 +17,6 @@ xineplug_decode_ff_la_LDFLAGS = \ $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \ -avoid-version -module -noinst_HEADERS = config.h - debug: @list='$(SUBDIRS)'; for subdir in $$list; do \ (cd $$subdir && $(MAKE) $@) || exit;\ diff --git a/src/libffmpeg/config.h b/src/libffmpeg/config.h deleted file mode 100644 index a28db4926..000000000 --- a/src/libffmpeg/config.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * this is just a fake config.h for libavcodec - */ - -#include "../../config.h" diff --git a/src/libffmpeg/libavcodec/idct_mmx.c b/src/libffmpeg/libavcodec/idct_mmx.c index 88fd3b806..7141347ec 100644 --- a/src/libffmpeg/libavcodec/idct_mmx.c +++ b/src/libffmpeg/libavcodec/idct_mmx.c @@ -24,7 +24,9 @@ #include <inttypes.h> -#include "../config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "xineutils.h" diff --git a/src/xine-engine/bswap.h b/src/xine-engine/bswap.h index 21ef3a74e..1351d0456 100644 --- a/src/xine-engine/bswap.h +++ b/src/xine-engine/bswap.h @@ -2,7 +2,9 @@ #define __BSWAP_H__ /* It's need for ffmpeg. Else where will be defined ARCH_X86?*/ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #ifdef HAVE_BYTESWAP_H #include <byteswap.h> |