summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/Makefile.am6
-rw-r--r--common/configure.ac2
-rw-r--r--common/linux/ffmpeg_inc.h.in12
-rw-r--r--common/win/ffmpeg_inc.h4
4 files changed, 3 insertions, 21 deletions
diff --git a/common/Makefile.am b/common/Makefile.am
index 8f96366b..bdff878c 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -53,10 +53,8 @@ pkgconfig_DATA = spice-common.pc
common_srcdir=$(prefix)/src/spice-common
common_src_DATA = $(COMMON_SRCS)
-linux_includedir=$(common_srcdir)/linux
-linux_include_DATA=linux/ffmpeg_inc.h
-
-DISTCLEANFILES = spice-common.pc linux/ffmpeg_inc.h
+DISTCLEANFILES = spice-common.pc
dist-hook:
cp -p -f ../autogen.sh ../configure.ac.shared $(distdir)
+
diff --git a/common/configure.ac b/common/configure.ac
index b2d7e22e..0e513160 100644
--- a/common/configure.ac
+++ b/common/configure.ac
@@ -10,7 +10,7 @@ AC_CONFIG_MACRO_DIR([m4])
m4_include(configure.ac.shared)
-AC_CONFIG_FILES([Makefile linux/ffmpeg_inc.h spice-common.pc])
+AC_CONFIG_FILES([Makefile spice-common.pc])
AC_OUTPUT
dnl ==========================================================================
diff --git a/common/linux/ffmpeg_inc.h.in b/common/linux/ffmpeg_inc.h.in
deleted file mode 100644
index 7e322b51..00000000
--- a/common/linux/ffmpeg_inc.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#ifdef __GNUG__
-extern "C" {
-#endif
-
-#include "@AVCODEC_PREFIX@avcodec.h"
-
-#ifdef __GNUG__
-}
-#endif
-
-
diff --git a/common/win/ffmpeg_inc.h b/common/win/ffmpeg_inc.h
deleted file mode 100644
index 8d4473ff..00000000
--- a/common/win/ffmpeg_inc.h
+++ /dev/null
@@ -1,4 +0,0 @@
-
-extern "C" {
-#include "libavcodec/avcodec.h"
-}