diff options
Diffstat (limited to 'src/libffmpeg')
| -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 |
3 files changed, 3 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" |