Move libcdio and libvcd into contrib/

--HG--
rename : src/input/vcd/libcdio/FreeBSD/freebsd.c => contrib/libcdio/FreeBSD/freebsd.c
rename : src/input/vcd/libcdio/FreeBSD/freebsd.h => contrib/libcdio/FreeBSD/freebsd.h
rename : src/input/vcd/libcdio/FreeBSD/freebsd_cam.c => contrib/libcdio/FreeBSD/freebsd_cam.c
rename : src/input/vcd/libcdio/FreeBSD/freebsd_ioctl.c => contrib/libcdio/FreeBSD/freebsd_ioctl.c
rename : src/input/vcd/libcdio/MSWindows/Makefile.am => contrib/libcdio/MSWindows/Makefile.am
rename : src/input/vcd/libcdio/MSWindows/aspi32.c => contrib/libcdio/MSWindows/aspi32.c
rename : src/input/vcd/libcdio/MSWindows/aspi32.h => contrib/libcdio/MSWindows/aspi32.h
rename : src/input/vcd/libcdio/MSWindows/win32.c => contrib/libcdio/MSWindows/win32.c
rename : src/input/vcd/libcdio/MSWindows/win32.h => contrib/libcdio/MSWindows/win32.h
rename : src/input/vcd/libcdio/MSWindows/win32_ioctl.c => contrib/libcdio/MSWindows/win32_ioctl.c
rename : src/input/vcd/libcdio/Makefile.am => contrib/libcdio/Makefile.am
rename : src/input/vcd/libcdio/_cdio_bsdi.c => contrib/libcdio/_cdio_bsdi.c
rename : src/input/vcd/libcdio/_cdio_generic.c => contrib/libcdio/_cdio_generic.c
rename : src/input/vcd/libcdio/_cdio_linux.c => contrib/libcdio/_cdio_linux.c
rename : src/input/vcd/libcdio/_cdio_osx.c => contrib/libcdio/_cdio_osx.c
rename : src/input/vcd/libcdio/_cdio_stdio.c => contrib/libcdio/_cdio_stdio.c
rename : src/input/vcd/libcdio/_cdio_stdio.h => contrib/libcdio/_cdio_stdio.h
rename : src/input/vcd/libcdio/_cdio_stream.c => contrib/libcdio/_cdio_stream.c
rename : src/input/vcd/libcdio/_cdio_stream.h => contrib/libcdio/_cdio_stream.h
rename : src/input/vcd/libcdio/_cdio_sunos.c => contrib/libcdio/_cdio_sunos.c
rename : src/input/vcd/libcdio/cd_types.c => contrib/libcdio/cd_types.c
rename : src/input/vcd/libcdio/cdio.c => contrib/libcdio/cdio.c
rename : src/input/vcd/libcdio/cdio/Makefile.am => contrib/libcdio/cdio/Makefile.am
rename : src/input/vcd/libcdio/cdio/bytesex.h => contrib/libcdio/cdio/bytesex.h
rename : src/input/vcd/libcdio/cdio/bytesex_asm.h => contrib/libcdio/cdio/bytesex_asm.h
rename : src/input/vcd/libcdio/cdio/cd_types.h => contrib/libcdio/cdio/cd_types.h
rename : src/input/vcd/libcdio/cdio/cdio.h => contrib/libcdio/cdio/cdio.h
rename : src/input/vcd/libcdio/cdio/cdtext.h => contrib/libcdio/cdio/cdtext.h
rename : src/input/vcd/libcdio/cdio/ds.h => contrib/libcdio/cdio/ds.h
rename : src/input/vcd/libcdio/cdio/dvd.h => contrib/libcdio/cdio/dvd.h
rename : src/input/vcd/libcdio/cdio/iso9660.h => contrib/libcdio/cdio/iso9660.h
rename : src/input/vcd/libcdio/cdio/logging.h => contrib/libcdio/cdio/logging.h
rename : src/input/vcd/libcdio/cdio/scsi_mmc.h => contrib/libcdio/cdio/scsi_mmc.h
rename : src/input/vcd/libcdio/cdio/sector.h => contrib/libcdio/cdio/sector.h
rename : src/input/vcd/libcdio/cdio/types.h => contrib/libcdio/cdio/types.h
rename : src/input/vcd/libcdio/cdio/util.h => contrib/libcdio/cdio/util.h
rename : src/input/vcd/libcdio/cdio/version.h => contrib/libcdio/cdio/version.h
rename : src/input/vcd/libcdio/cdio/xa.h => contrib/libcdio/cdio/xa.h
rename : src/input/vcd/libcdio/cdio_assert.h => contrib/libcdio/cdio_assert.h
rename : src/input/vcd/libcdio/cdio_private.h => contrib/libcdio/cdio_private.h
rename : src/input/vcd/libcdio/cdtext.c => contrib/libcdio/cdtext.c
rename : src/input/vcd/libcdio/cdtext_private.h => contrib/libcdio/cdtext_private.h
rename : src/input/vcd/libcdio/ds.c => contrib/libcdio/ds.c
rename : src/input/vcd/libcdio/generic.h => contrib/libcdio/generic.h
rename : src/input/vcd/libcdio/image.h => contrib/libcdio/image.h
rename : src/input/vcd/libcdio/image/Makefile.am => contrib/libcdio/image/Makefile.am
rename : src/input/vcd/libcdio/image/bincue.c => contrib/libcdio/image/bincue.c
rename : src/input/vcd/libcdio/image/cdrdao.c => contrib/libcdio/image/cdrdao.c
rename : src/input/vcd/libcdio/image/nrg.c => contrib/libcdio/image/nrg.c
rename : src/input/vcd/libcdio/image/nrg.h => contrib/libcdio/image/nrg.h
rename : src/input/vcd/libcdio/image_common.h => contrib/libcdio/image_common.h
rename : src/input/vcd/libcdio/iso9660.c => contrib/libcdio/iso9660.c
rename : src/input/vcd/libcdio/iso9660_fs.c => contrib/libcdio/iso9660_fs.c
rename : src/input/vcd/libcdio/iso9660_private.h => contrib/libcdio/iso9660_private.h
rename : src/input/vcd/libcdio/logging.c => contrib/libcdio/logging.c
rename : src/input/vcd/libcdio/portable.h => contrib/libcdio/portable.h
rename : src/input/vcd/libcdio/scsi_mmc.c => contrib/libcdio/scsi_mmc.c
rename : src/input/vcd/libcdio/scsi_mmc.h => contrib/libcdio/scsi_mmc.h
rename : src/input/vcd/libcdio/scsi_mmc_private.h => contrib/libcdio/scsi_mmc_private.h
rename : src/input/vcd/libcdio/sector.c => contrib/libcdio/sector.c
rename : src/input/vcd/libcdio/util.c => contrib/libcdio/util.c
rename : src/input/vcd/libcdio/xa.c => contrib/libcdio/xa.c
rename : src/input/vcd/libvcd/Makefile.am => contrib/libvcd/Makefile.am
rename : src/input/vcd/libvcd/bitvec.h => contrib/libvcd/bitvec.h
rename : src/input/vcd/libvcd/bytesex.h => contrib/libvcd/bytesex.h
rename : src/input/vcd/libvcd/bytesex_asm.h => contrib/libvcd/bytesex_asm.h
rename : src/input/vcd/libvcd/data_structures.c => contrib/libvcd/data_structures.c
rename : src/input/vcd/libvcd/data_structures.h => contrib/libvcd/data_structures.h
rename : src/input/vcd/libvcd/dict.h => contrib/libvcd/dict.h
rename : src/input/vcd/libvcd/directory.c => contrib/libvcd/directory.c
rename : src/input/vcd/libvcd/directory.h => contrib/libvcd/directory.h
rename : src/input/vcd/libvcd/files.c => contrib/libvcd/files.c
rename : src/input/vcd/libvcd/image.c => contrib/libvcd/image.c
rename : src/input/vcd/libvcd/image_bincue.c => contrib/libvcd/image_bincue.c
rename : src/input/vcd/libvcd/image_cdrdao.c => contrib/libvcd/image_cdrdao.c
rename : src/input/vcd/libvcd/image_nrg.c => contrib/libvcd/image_nrg.c
rename : src/input/vcd/libvcd/image_sink.h => contrib/libvcd/image_sink.h
rename : src/input/vcd/libvcd/inf.c => contrib/libvcd/inf.c
rename : src/input/vcd/libvcd/info.c => contrib/libvcd/info.c
rename : src/input/vcd/libvcd/info_private.c => contrib/libvcd/info_private.c
rename : src/input/vcd/libvcd/info_private.h => contrib/libvcd/info_private.h
rename : src/input/vcd/libvcd/libvcd/Makefile.am => contrib/libvcd/libvcd/Makefile.am
rename : src/input/vcd/libvcd/libvcd/files.h => contrib/libvcd/libvcd/files.h
rename : src/input/vcd/libvcd/libvcd/files_private.h => contrib/libvcd/libvcd/files_private.h
rename : src/input/vcd/libvcd/libvcd/inf.h => contrib/libvcd/libvcd/inf.h
rename : src/input/vcd/libvcd/libvcd/info.h => contrib/libvcd/libvcd/info.h
rename : src/input/vcd/libvcd/libvcd/logging.h => contrib/libvcd/libvcd/logging.h
rename : src/input/vcd/libvcd/libvcd/sector.h => contrib/libvcd/libvcd/sector.h
rename : src/input/vcd/libvcd/libvcd/types.h => contrib/libvcd/libvcd/types.h
rename : src/input/vcd/libvcd/libvcd/version.h => contrib/libvcd/libvcd/version.h
rename : src/input/vcd/libvcd/logging.c => contrib/libvcd/logging.c
rename : src/input/vcd/libvcd/mpeg.c => contrib/libvcd/mpeg.c
rename : src/input/vcd/libvcd/mpeg.h => contrib/libvcd/mpeg.h
rename : src/input/vcd/libvcd/mpeg_stream.c => contrib/libvcd/mpeg_stream.c
rename : src/input/vcd/libvcd/mpeg_stream.h => contrib/libvcd/mpeg_stream.h
rename : src/input/vcd/libvcd/obj.h => contrib/libvcd/obj.h
rename : src/input/vcd/libvcd/pbc.c => contrib/libvcd/pbc.c
rename : src/input/vcd/libvcd/pbc.h => contrib/libvcd/pbc.h
rename : src/input/vcd/libvcd/salloc.c => contrib/libvcd/salloc.c
rename : src/input/vcd/libvcd/salloc.h => contrib/libvcd/salloc.h
rename : src/input/vcd/libvcd/sector.c => contrib/libvcd/sector.c
rename : src/input/vcd/libvcd/sector_private.h => contrib/libvcd/sector_private.h
rename : src/input/vcd/libvcd/stream.c => contrib/libvcd/stream.c
rename : src/input/vcd/libvcd/stream.h => contrib/libvcd/stream.h
rename : src/input/vcd/libvcd/stream_stdio.c => contrib/libvcd/stream_stdio.c
rename : src/input/vcd/libvcd/stream_stdio.h => contrib/libvcd/stream_stdio.h
rename : src/input/vcd/libvcd/util.c => contrib/libvcd/util.c
rename : src/input/vcd/libvcd/util.h => contrib/libvcd/util.h
rename : src/input/vcd/libvcd/vcd.c => contrib/libvcd/vcd.c
rename : src/input/vcd/libvcd/vcd.h => contrib/libvcd/vcd.h
rename : src/input/vcd/libvcd/vcd_assert.h => contrib/libvcd/vcd_assert.h
rename : src/input/vcd/libvcd/vcd_read.c => contrib/libvcd/vcd_read.c
rename : src/input/vcd/libvcd/vcd_read.h => contrib/libvcd/vcd_read.h

117 files changed, 16 insertions, 17 deletions

diff --git a/configure.ac b/configure.ac
index 0af6b6d7b..dcf89eeec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1116,6 +1116,10 @@ doc/Doxyfile
 contrib/Makefile
 contrib/a52dec/Makefile
 contrib/gsm610/Makefile
+contrib/libcdio/Makefile
+contrib/libcdio/cdio/Makefile
+contrib/libcdio/MSWindows/Makefile
+contrib/libcdio/image/Makefile
 contrib/libdca/Makefile
 contrib/libdha/Makefile
 contrib/libdha/bin/Makefile
@@ -1125,6 +1129,8 @@ contrib/libdha/sysdep/Makefile
 contrib/libfaad/Makefile
 contrib/libmad/Makefile
 contrib/libmpcdec/Makefile
+contrib/libvcd/Makefile
+contrib/libvcd/libvcd/Makefile
 contrib/libxdg-basedir/Makefile
 contrib/nosefart/Makefile
 contrib/vidix/Makefile
@@ -1153,12 +1159,6 @@ src/input/libdvdnav/Makefile
 src/input/librtsp/Makefile
 src/input/libreal/Makefile
 src/input/vcd/Makefile
-src/input/vcd/libcdio/Makefile
-src/input/vcd/libcdio/cdio/Makefile
-src/input/vcd/libcdio/MSWindows/Makefile
-src/input/vcd/libcdio/image/Makefile
-src/input/vcd/libvcd/Makefile
-src/input/vcd/libvcd/libvcd/Makefile
 src/libffmpeg/Makefile
 src/libmpeg2/Makefile
 src/libspudec/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 03cb3390f..2258d2fd2 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -14,6 +14,10 @@ endif
 SUBDIRS += vidix
 endif
 
+if !WITH_EXTERNAL_VCDLIBS
+SUBDIRS += libcdio libvcd
+endif
+
 srcdir = $(shell cd @srcdir@; pwd)
 
 ffmpeg_builder = $(srcdir)/ffmpeg-universal.sh
diff --git a/src/input/vcd/libcdio/FreeBSD/freebsd.c b/contrib/libcdio/FreeBSD/freebsd.c
index daea9b3f5..daea9b3f5 100644
--- a/src/input/vcd/libcdio/FreeBSD/freebsd.c
+++ b/contrib/libcdio/FreeBSD/freebsd.c
diff --git a/src/input/vcd/libcdio/FreeBSD/freebsd.h b/contrib/libcdio/FreeBSD/freebsd.h
index 50894c912..50894c912 100644
--- a/src/input/vcd/libcdio/FreeBSD/freebsd.h
+++ b/contrib/libcdio/FreeBSD/freebsd.h
diff --git a/src/input/vcd/libcdio/FreeBSD/freebsd_cam.c b/contrib/libcdio/FreeBSD/freebsd_cam.c
index 68e38ccae..68e38ccae 100644
--- a/src/input/vcd/libcdio/FreeBSD/freebsd_cam.c
+++ b/contrib/libcdio/FreeBSD/freebsd_cam.c
diff --git a/src/input/vcd/libcdio/FreeBSD/freebsd_ioctl.c b/contrib/libcdio/FreeBSD/freebsd_ioctl.c
index be9835c95..be9835c95 100644
--- a/src/input/vcd/libcdio/FreeBSD/freebsd_ioctl.c
+++ b/contrib/libcdio/FreeBSD/freebsd_ioctl.c
diff --git a/src/input/vcd/libcdio/MSWindows/Makefile.am b/contrib/libcdio/MSWindows/Makefile.am
index 61089cf69..61089cf69 100644
--- a/src/input/vcd/libcdio/MSWindows/Makefile.am
+++ b/contrib/libcdio/MSWindows/Makefile.am
diff --git a/src/input/vcd/libcdio/MSWindows/aspi32.c b/contrib/libcdio/MSWindows/aspi32.c
index 238a4b4e9..238a4b4e9 100644
--- a/src/input/vcd/libcdio/MSWindows/aspi32.c
+++ b/contrib/libcdio/MSWindows/aspi32.c
diff --git a/src/input/vcd/libcdio/MSWindows/aspi32.h b/contrib/libcdio/MSWindows/aspi32.h
index 8742c0794..8742c0794 100644
--- a/src/input/vcd/libcdio/MSWindows/aspi32.h
+++ b/contrib/libcdio/MSWindows/aspi32.h
diff --git a/src/input/vcd/libcdio/MSWindows/win32.c b/contrib/libcdio/MSWindows/win32.c
index 1c9d9b93d..1c9d9b93d 100644
--- a/src/input/vcd/libcdio/MSWindows/win32.c
+++ b/contrib/libcdio/MSWindows/win32.c
diff --git a/src/input/vcd/libcdio/MSWindows/win32.h b/contrib/libcdio/MSWindows/win32.h
index 84f3b67b3..84f3b67b3 100644
--- a/src/input/vcd/libcdio/MSWindows/win32.h
+++ b/contrib/libcdio/MSWindows/win32.h
diff --git a/src/input/vcd/libcdio/MSWindows/win32_ioctl.c b/contrib/libcdio/MSWindows/win32_ioctl.c
index dec24e785..dec24e785 100644
--- a/src/input/vcd/libcdio/MSWindows/win32_ioctl.c
+++ b/contrib/libcdio/MSWindows/win32_ioctl.c
diff --git a/src/input/vcd/libcdio/Makefile.am b/contrib/libcdio/Makefile.am
index a79525c8f..a79525c8f 100644
--- a/src/input/vcd/libcdio/Makefile.am
+++ b/contrib/libcdio/Makefile.am
diff --git a/src/input/vcd/libcdio/_cdio_bsdi.c b/contrib/libcdio/_cdio_bsdi.c
index aef535752..aef535752 100644
--- a/src/input/vcd/libcdio/_cdio_bsdi.c
+++ b/contrib/libcdio/_cdio_bsdi.c
diff --git a/src/input/vcd/libcdio/_cdio_generic.c b/contrib/libcdio/_cdio_generic.c
index fb3ed5a9c..fb3ed5a9c 100644
--- a/src/input/vcd/libcdio/_cdio_generic.c
+++ b/contrib/libcdio/_cdio_generic.c
diff --git a/src/input/vcd/libcdio/_cdio_linux.c b/contrib/libcdio/_cdio_linux.c
index ea70d262c..ea70d262c 100644
--- a/src/input/vcd/libcdio/_cdio_linux.c
+++ b/contrib/libcdio/_cdio_linux.c
diff --git a/src/input/vcd/libcdio/_cdio_osx.c b/contrib/libcdio/_cdio_osx.c
index f754933c6..f754933c6 100644
--- a/src/input/vcd/libcdio/_cdio_osx.c
+++ b/contrib/libcdio/_cdio_osx.c
diff --git a/src/input/vcd/libcdio/_cdio_stdio.c b/contrib/libcdio/_cdio_stdio.c
index 0083b2194..0083b2194 100644
--- a/src/input/vcd/libcdio/_cdio_stdio.c
+++ b/contrib/libcdio/_cdio_stdio.c
diff --git a/src/input/vcd/libcdio/_cdio_stdio.h b/contrib/libcdio/_cdio_stdio.h
index f5e79c41c..f5e79c41c 100644
--- a/src/input/vcd/libcdio/_cdio_stdio.h
+++ b/contrib/libcdio/_cdio_stdio.h
diff --git a/src/input/vcd/libcdio/_cdio_stream.c b/contrib/libcdio/_cdio_stream.c
index fc1f7fce7..fc1f7fce7 100644
--- a/src/input/vcd/libcdio/_cdio_stream.c
+++ b/contrib/libcdio/_cdio_stream.c
diff --git a/src/input/vcd/libcdio/_cdio_stream.h b/contrib/libcdio/_cdio_stream.h
index ffbb4098e..ffbb4098e 100644
--- a/src/input/vcd/libcdio/_cdio_stream.h
+++ b/contrib/libcdio/_cdio_stream.h
diff --git a/src/input/vcd/libcdio/_cdio_sunos.c b/contrib/libcdio/_cdio_sunos.c
index 245d1e319..245d1e319 100644
--- a/src/input/vcd/libcdio/_cdio_sunos.c
+++ b/contrib/libcdio/_cdio_sunos.c
diff --git a/src/input/vcd/libcdio/cd_types.c b/contrib/libcdio/cd_types.c
index b983f9899..b983f9899 100644
--- a/src/input/vcd/libcdio/cd_types.c
+++ b/contrib/libcdio/cd_types.c
diff --git a/src/input/vcd/libcdio/cdio.c b/contrib/libcdio/cdio.c
index fc18add91..fc18add91 100644
--- a/src/input/vcd/libcdio/cdio.c
+++ b/contrib/libcdio/cdio.c
diff --git a/src/input/vcd/libcdio/cdio/Makefile.am b/contrib/libcdio/cdio/Makefile.am
index 0910d60e5..0910d60e5 100644
--- a/src/input/vcd/libcdio/cdio/Makefile.am
+++ b/contrib/libcdio/cdio/Makefile.am
diff --git a/src/input/vcd/libcdio/cdio/bytesex.h b/contrib/libcdio/cdio/bytesex.h
index c40e44729..c40e44729 100644
--- a/src/input/vcd/libcdio/cdio/bytesex.h
+++ b/contrib/libcdio/cdio/bytesex.h
diff --git a/src/input/vcd/libcdio/cdio/bytesex_asm.h b/contrib/libcdio/cdio/bytesex_asm.h
index 4291563ec..4291563ec 100644
--- a/src/input/vcd/libcdio/cdio/bytesex_asm.h
+++ b/contrib/libcdio/cdio/bytesex_asm.h
diff --git a/src/input/vcd/libcdio/cdio/cd_types.h b/contrib/libcdio/cdio/cd_types.h
index 9f4a73f67..9f4a73f67 100644
--- a/src/input/vcd/libcdio/cdio/cd_types.h
+++ b/contrib/libcdio/cdio/cd_types.h
diff --git a/src/input/vcd/libcdio/cdio/cdio.h b/contrib/libcdio/cdio/cdio.h
index f9e2a38e3..f9e2a38e3 100644
--- a/src/input/vcd/libcdio/cdio/cdio.h
+++ b/contrib/libcdio/cdio/cdio.h
diff --git a/src/input/vcd/libcdio/cdio/cdtext.h b/contrib/libcdio/cdio/cdtext.h
index 4b397a3ff..4b397a3ff 100644
--- a/src/input/vcd/libcdio/cdio/cdtext.h
+++ b/contrib/libcdio/cdio/cdtext.h
diff --git a/src/input/vcd/libcdio/cdio/ds.h b/contrib/libcdio/cdio/ds.h
index c811cadd4..c811cadd4 100644
--- a/src/input/vcd/libcdio/cdio/ds.h
+++ b/contrib/libcdio/cdio/ds.h
diff --git a/src/input/vcd/libcdio/cdio/dvd.h b/contrib/libcdio/cdio/dvd.h
index df58c4322..df58c4322 100644
--- a/src/input/vcd/libcdio/cdio/dvd.h
+++ b/contrib/libcdio/cdio/dvd.h
diff --git a/src/input/vcd/libcdio/cdio/iso9660.h b/contrib/libcdio/cdio/iso9660.h
index 104b6ba62..104b6ba62 100644
--- a/src/input/vcd/libcdio/cdio/iso9660.h
+++ b/contrib/libcdio/cdio/iso9660.h
diff --git a/src/input/vcd/libcdio/cdio/logging.h b/contrib/libcdio/cdio/logging.h
index 8c78259ea..8c78259ea 100644
--- a/src/input/vcd/libcdio/cdio/logging.h
+++ b/contrib/libcdio/cdio/logging.h
diff --git a/src/input/vcd/libcdio/cdio/scsi_mmc.h b/contrib/libcdio/cdio/scsi_mmc.h
index 12860247e..12860247e 100644
--- a/src/input/vcd/libcdio/cdio/scsi_mmc.h
+++ b/contrib/libcdio/cdio/scsi_mmc.h
diff --git a/src/input/vcd/libcdio/cdio/sector.h b/contrib/libcdio/cdio/sector.h
index 826883aea..826883aea 100644
--- a/src/input/vcd/libcdio/cdio/sector.h
+++ b/contrib/libcdio/cdio/sector.h
diff --git a/src/input/vcd/libcdio/cdio/types.h b/contrib/libcdio/cdio/types.h
index ec84a142b..ec84a142b 100644
--- a/src/input/vcd/libcdio/cdio/types.h
+++ b/contrib/libcdio/cdio/types.h
diff --git a/src/input/vcd/libcdio/cdio/util.h b/contrib/libcdio/cdio/util.h
index 3cea313b4..3cea313b4 100644
--- a/src/input/vcd/libcdio/cdio/util.h
+++ b/contrib/libcdio/cdio/util.h
diff --git a/src/input/vcd/libcdio/cdio/version.h b/contrib/libcdio/cdio/version.h
index 345924cab..345924cab 100644
--- a/src/input/vcd/libcdio/cdio/version.h
+++ b/contrib/libcdio/cdio/version.h
diff --git a/src/input/vcd/libcdio/cdio/xa.h b/contrib/libcdio/cdio/xa.h
index 3af27eab5..3af27eab5 100644
--- a/src/input/vcd/libcdio/cdio/xa.h
+++ b/contrib/libcdio/cdio/xa.h
diff --git a/src/input/vcd/libcdio/cdio_assert.h b/contrib/libcdio/cdio_assert.h
index 2433bf0c7..2433bf0c7 100644
--- a/src/input/vcd/libcdio/cdio_assert.h
+++ b/contrib/libcdio/cdio_assert.h
diff --git a/src/input/vcd/libcdio/cdio_private.h b/contrib/libcdio/cdio_private.h
index b1e2777ed..b1e2777ed 100644
--- a/src/input/vcd/libcdio/cdio_private.h
+++ b/contrib/libcdio/cdio_private.h
diff --git a/src/input/vcd/libcdio/cdtext.c b/contrib/libcdio/cdtext.c
index 5842641f7..5842641f7 100644
--- a/src/input/vcd/libcdio/cdtext.c
+++ b/contrib/libcdio/cdtext.c
diff --git a/src/input/vcd/libcdio/cdtext_private.h b/contrib/libcdio/cdtext_private.h
index 03a9c4945..03a9c4945 100644
--- a/src/input/vcd/libcdio/cdtext_private.h
+++ b/contrib/libcdio/cdtext_private.h
diff --git a/src/input/vcd/libcdio/ds.c b/contrib/libcdio/ds.c
index 381c0f00c..381c0f00c 100644
--- a/src/input/vcd/libcdio/ds.c
+++ b/contrib/libcdio/ds.c
diff --git a/src/input/vcd/libcdio/generic.h b/contrib/libcdio/generic.h
index 9deb77254..9deb77254 100644
--- a/src/input/vcd/libcdio/generic.h
+++ b/contrib/libcdio/generic.h
diff --git a/src/input/vcd/libcdio/image.h b/contrib/libcdio/image.h
index 79c836d32..79c836d32 100644
--- a/src/input/vcd/libcdio/image.h
+++ b/contrib/libcdio/image.h
diff --git a/src/input/vcd/libcdio/image/Makefile.am b/contrib/libcdio/image/Makefile.am
index e7a09e980..e7a09e980 100644
--- a/src/input/vcd/libcdio/image/Makefile.am
+++ b/contrib/libcdio/image/Makefile.am
diff --git a/src/input/vcd/libcdio/image/bincue.c b/contrib/libcdio/image/bincue.c
index 56f0e151c..56f0e151c 100644
--- a/src/input/vcd/libcdio/image/bincue.c
+++ b/contrib/libcdio/image/bincue.c
diff --git a/src/input/vcd/libcdio/image/cdrdao.c b/contrib/libcdio/image/cdrdao.c
index 828172721..828172721 100644
--- a/src/input/vcd/libcdio/image/cdrdao.c
+++ b/contrib/libcdio/image/cdrdao.c
diff --git a/src/input/vcd/libcdio/image/nrg.c b/contrib/libcdio/image/nrg.c
index 40e5bbbf7..40e5bbbf7 100644
--- a/src/input/vcd/libcdio/image/nrg.c
+++ b/contrib/libcdio/image/nrg.c
diff --git a/src/input/vcd/libcdio/image/nrg.h b/contrib/libcdio/image/nrg.h
index 2923c78f1..2923c78f1 100644
--- a/src/input/vcd/libcdio/image/nrg.h
+++ b/contrib/libcdio/image/nrg.h
diff --git a/src/input/vcd/libcdio/image_common.h b/contrib/libcdio/image_common.h
index 30699c15c..30699c15c 100644
--- a/src/input/vcd/libcdio/image_common.h
+++ b/contrib/libcdio/image_common.h
diff --git a/src/input/vcd/libcdio/iso9660.c b/contrib/libcdio/iso9660.c
index 91b89d516..91b89d516 100644
--- a/src/input/vcd/libcdio/iso9660.c
+++ b/contrib/libcdio/iso9660.c
diff --git a/src/input/vcd/libcdio/iso9660_fs.c b/contrib/libcdio/iso9660_fs.c
index fff12cd7c..fff12cd7c 100644
--- a/src/input/vcd/libcdio/iso9660_fs.c
+++ b/contrib/libcdio/iso9660_fs.c
diff --git a/src/input/vcd/libcdio/iso9660_private.h b/contrib/libcdio/iso9660_private.h
index 9a10950aa..9a10950aa 100644
--- a/src/input/vcd/libcdio/iso9660_private.h
+++ b/contrib/libcdio/iso9660_private.h
diff --git a/src/input/vcd/libcdio/logging.c b/contrib/libcdio/logging.c
index 8d561debe..8d561debe 100644
--- a/src/input/vcd/libcdio/logging.c
+++ b/contrib/libcdio/logging.c
diff --git a/src/input/vcd/libcdio/portable.h b/contrib/libcdio/portable.h
index 3da436245..3da436245 100644
--- a/src/input/vcd/libcdio/portable.h
+++ b/contrib/libcdio/portable.h
diff --git a/src/input/vcd/libcdio/scsi_mmc.c b/contrib/libcdio/scsi_mmc.c
index 9b4a456a5..9b4a456a5 100644
--- a/src/input/vcd/libcdio/scsi_mmc.c
+++ b/contrib/libcdio/scsi_mmc.c
diff --git a/src/input/vcd/libcdio/scsi_mmc.h b/contrib/libcdio/scsi_mmc.h
index b6ea05b7a..b6ea05b7a 100644
--- a/src/input/vcd/libcdio/scsi_mmc.h
+++ b/contrib/libcdio/scsi_mmc.h
diff --git a/src/input/vcd/libcdio/scsi_mmc_private.h b/contrib/libcdio/scsi_mmc_private.h
index b3f1e7061..b3f1e7061 100644
--- a/src/input/vcd/libcdio/scsi_mmc_private.h
+++ b/contrib/libcdio/scsi_mmc_private.h
diff --git a/src/input/vcd/libcdio/sector.c b/contrib/libcdio/sector.c
index da49e9908..da49e9908 100644
--- a/src/input/vcd/libcdio/sector.c
+++ b/contrib/libcdio/sector.c
diff --git a/src/input/vcd/libcdio/util.c b/contrib/libcdio/util.c
index 9c646daf6..9c646daf6 100644
--- a/src/input/vcd/libcdio/util.c
+++ b/contrib/libcdio/util.c
diff --git a/src/input/vcd/libcdio/xa.c b/contrib/libcdio/xa.c
index f811f7ebd..f811f7ebd 100644
--- a/src/input/vcd/libcdio/xa.c
+++ b/contrib/libcdio/xa.c
diff --git a/src/input/vcd/libvcd/Makefile.am b/contrib/libvcd/Makefile.am
index c922685e3..c922685e3 100644
--- a/src/input/vcd/libvcd/Makefile.am
+++ b/contrib/libvcd/Makefile.am
diff --git a/src/input/vcd/libvcd/bitvec.h b/contrib/libvcd/bitvec.h
index f45059db0..f45059db0 100644
--- a/src/input/vcd/libvcd/bitvec.h
+++ b/contrib/libvcd/bitvec.h
diff --git a/src/input/vcd/libvcd/bytesex.h b/contrib/libvcd/bytesex.h
index 9a212693d..9a212693d 100644
--- a/src/input/vcd/libvcd/bytesex.h
+++ b/contrib/libvcd/bytesex.h
diff --git a/src/input/vcd/libvcd/bytesex_asm.h b/contrib/libvcd/bytesex_asm.h
index 3265c592b..3265c592b 100644
--- a/src/input/vcd/libvcd/bytesex_asm.h
+++ b/contrib/libvcd/bytesex_asm.h
diff --git a/src/input/vcd/libvcd/data_structures.c b/contrib/libvcd/data_structures.c
index 1fdca95c9..1fdca95c9 100644
--- a/src/input/vcd/libvcd/data_structures.c
+++ b/contrib/libvcd/data_structures.c
diff --git a/src/input/vcd/libvcd/data_structures.h b/contrib/libvcd/data_structures.h
index 70fe88045..70fe88045 100644
--- a/src/input/vcd/libvcd/data_structures.h
+++ b/contrib/libvcd/data_structures.h
diff --git a/src/input/vcd/libvcd/dict.h b/contrib/libvcd/dict.h
index 229ad5706..229ad5706 100644
--- a/src/input/vcd/libvcd/dict.h
+++ b/contrib/libvcd/dict.h
diff --git a/src/input/vcd/libvcd/directory.c b/contrib/libvcd/directory.c
index 992d728c6..992d728c6 100644
--- a/src/input/vcd/libvcd/directory.c
+++ b/contrib/libvcd/directory.c
diff --git a/src/input/vcd/libvcd/directory.h b/contrib/libvcd/directory.h
index c4cba9efc..c4cba9efc 100644
--- a/src/input/vcd/libvcd/directory.h
+++ b/contrib/libvcd/directory.h
diff --git a/src/input/vcd/libvcd/files.c b/contrib/libvcd/files.c
index 38780edf0..38780edf0 100644
--- a/src/input/vcd/libvcd/files.c
+++ b/contrib/libvcd/files.c
diff --git a/src/input/vcd/libvcd/image.c b/contrib/libvcd/image.c
index d26bb0910..d26bb0910 100644
--- a/src/input/vcd/libvcd/image.c
+++ b/contrib/libvcd/image.c
diff --git a/src/input/vcd/libvcd/image_bincue.c b/contrib/libvcd/image_bincue.c
index 9c447a42a..9c447a42a 100644
--- a/src/input/vcd/libvcd/image_bincue.c
+++ b/contrib/libvcd/image_bincue.c
diff --git a/src/input/vcd/libvcd/image_cdrdao.c b/contrib/libvcd/image_cdrdao.c
index 5e00c14ee..5e00c14ee 100644
--- a/src/input/vcd/libvcd/image_cdrdao.c
+++ b/contrib/libvcd/image_cdrdao.c
diff --git a/src/input/vcd/libvcd/image_nrg.c b/contrib/libvcd/image_nrg.c
index 1faeb98a9..1faeb98a9 100644
--- a/src/input/vcd/libvcd/image_nrg.c
+++ b/contrib/libvcd/image_nrg.c
diff --git a/src/input/vcd/libvcd/image_sink.h b/contrib/libvcd/image_sink.h
index a71e30199..a71e30199 100644
--- a/src/input/vcd/libvcd/image_sink.h
+++ b/contrib/libvcd/image_sink.h
diff --git a/src/input/vcd/libvcd/inf.c b/contrib/libvcd/inf.c
index 588c8e5f7..588c8e5f7 100644
--- a/src/input/vcd/libvcd/inf.c
+++ b/contrib/libvcd/inf.c
diff --git a/src/input/vcd/libvcd/info.c b/contrib/libvcd/info.c
index b01bd6eee..b01bd6eee 100644
--- a/src/input/vcd/libvcd/info.c
+++ b/contrib/libvcd/info.c
diff --git a/src/input/vcd/libvcd/info_private.c b/contrib/libvcd/info_private.c
index 9f89a3dcb..9f89a3dcb 100644
--- a/src/input/vcd/libvcd/info_private.c
+++ b/contrib/libvcd/info_private.c
diff --git a/src/input/vcd/libvcd/info_private.h b/contrib/libvcd/info_private.h
index d17b6680b..d17b6680b 100644
--- a/src/input/vcd/libvcd/info_private.h
+++ b/contrib/libvcd/info_private.h
diff --git a/src/input/vcd/libvcd/libvcd/Makefile.am b/contrib/libvcd/libvcd/Makefile.am
index ea29859f6..ea29859f6 100644
--- a/src/input/vcd/libvcd/libvcd/Makefile.am
+++ b/contrib/libvcd/libvcd/Makefile.am
diff --git a/src/input/vcd/libvcd/libvcd/files.h b/contrib/libvcd/libvcd/files.h
index 91eeafad8..91eeafad8 100644
--- a/src/input/vcd/libvcd/libvcd/files.h
+++ b/contrib/libvcd/libvcd/files.h
diff --git a/src/input/vcd/libvcd/libvcd/files_private.h b/contrib/libvcd/libvcd/files_private.h
index aabb6ab0c..aabb6ab0c 100644
--- a/src/input/vcd/libvcd/libvcd/files_private.h
+++ b/contrib/libvcd/libvcd/files_private.h
diff --git a/src/input/vcd/libvcd/libvcd/inf.h b/contrib/libvcd/libvcd/inf.h
index fcd9098e2..fcd9098e2 100644
--- a/src/input/vcd/libvcd/libvcd/inf.h
+++ b/contrib/libvcd/libvcd/inf.h
diff --git a/src/input/vcd/libvcd/libvcd/info.h b/contrib/libvcd/libvcd/info.h
index 91b25c956..91b25c956 100644
--- a/src/input/vcd/libvcd/libvcd/info.h
+++ b/contrib/libvcd/libvcd/info.h
diff --git a/src/input/vcd/libvcd/libvcd/logging.h b/contrib/libvcd/libvcd/logging.h
index bc088ed1c..bc088ed1c 100644
--- a/src/input/vcd/libvcd/libvcd/logging.h
+++ b/contrib/libvcd/libvcd/logging.h
diff --git a/src/input/vcd/libvcd/libvcd/sector.h b/contrib/libvcd/libvcd/sector.h
index 32c2cc89a..32c2cc89a 100644
--- a/src/input/vcd/libvcd/libvcd/sector.h
+++ b/contrib/libvcd/libvcd/sector.h
diff --git a/src/input/vcd/libvcd/libvcd/types.h b/contrib/libvcd/libvcd/types.h
index 56a07d447..56a07d447 100644
--- a/src/input/vcd/libvcd/libvcd/types.h
+++ b/contrib/libvcd/libvcd/types.h
diff --git a/src/input/vcd/libvcd/libvcd/version.h b/contrib/libvcd/libvcd/version.h
index 0cd2096d3..0cd2096d3 100644
--- a/src/input/vcd/libvcd/libvcd/version.h
+++ b/contrib/libvcd/libvcd/version.h
diff --git a/src/input/vcd/libvcd/logging.c b/contrib/libvcd/logging.c
index 652a8090b..652a8090b 100644
--- a/src/input/vcd/libvcd/logging.c
+++ b/contrib/libvcd/logging.c
diff --git a/src/input/vcd/libvcd/mpeg.c b/contrib/libvcd/mpeg.c
index 545a44fbc..545a44fbc 100644
--- a/src/input/vcd/libvcd/mpeg.c
+++ b/contrib/libvcd/mpeg.c
diff --git a/src/input/vcd/libvcd/mpeg.h b/contrib/libvcd/mpeg.h
index 2d28d2aef..2d28d2aef 100644
--- a/src/input/vcd/libvcd/mpeg.h
+++ b/contrib/libvcd/mpeg.h
diff --git a/src/input/vcd/libvcd/mpeg_stream.c b/contrib/libvcd/mpeg_stream.c
index e5466766a..e5466766a 100644
--- a/src/input/vcd/libvcd/mpeg_stream.c
+++ b/contrib/libvcd/mpeg_stream.c
diff --git a/src/input/vcd/libvcd/mpeg_stream.h b/contrib/libvcd/mpeg_stream.h
index 14f73d928..14f73d928 100644
--- a/src/input/vcd/libvcd/mpeg_stream.h
+++ b/contrib/libvcd/mpeg_stream.h
diff --git a/src/input/vcd/libvcd/obj.h b/contrib/libvcd/obj.h
index d6849a3ab..d6849a3ab 100644
--- a/src/input/vcd/libvcd/obj.h
+++ b/contrib/libvcd/obj.h
diff --git a/src/input/vcd/libvcd/pbc.c b/contrib/libvcd/pbc.c
index 1b4f1a6c1..1b4f1a6c1 100644
--- a/src/input/vcd/libvcd/pbc.c
+++ b/contrib/libvcd/pbc.c
diff --git a/src/input/vcd/libvcd/pbc.h b/contrib/libvcd/pbc.h
index 9972c3143..9972c3143 100644
--- a/src/input/vcd/libvcd/pbc.h
+++ b/contrib/libvcd/pbc.h
diff --git a/src/input/vcd/libvcd/salloc.c b/contrib/libvcd/salloc.c
index d6fc41c68..d6fc41c68 100644
--- a/src/input/vcd/libvcd/salloc.c
+++ b/contrib/libvcd/salloc.c
diff --git a/src/input/vcd/libvcd/salloc.h b/contrib/libvcd/salloc.h
index 4676f9b45..4676f9b45 100644
--- a/src/input/vcd/libvcd/salloc.h
+++ b/contrib/libvcd/salloc.h
diff --git a/src/input/vcd/libvcd/sector.c b/contrib/libvcd/sector.c
index d072a4f17..d072a4f17 100644
--- a/src/input/vcd/libvcd/sector.c
+++ b/contrib/libvcd/sector.c
diff --git a/src/input/vcd/libvcd/sector_private.h b/contrib/libvcd/sector_private.h
index 9411b5420..9411b5420 100644
--- a/src/input/vcd/libvcd/sector_private.h
+++ b/contrib/libvcd/sector_private.h
diff --git a/src/input/vcd/libvcd/stream.c b/contrib/libvcd/stream.c
index 2840a05d6..2840a05d6 100644
--- a/src/input/vcd/libvcd/stream.c
+++ b/contrib/libvcd/stream.c
diff --git a/src/input/vcd/libvcd/stream.h b/contrib/libvcd/stream.h
index 43b8c911a..43b8c911a 100644
--- a/src/input/vcd/libvcd/stream.h
+++ b/contrib/libvcd/stream.h
diff --git a/src/input/vcd/libvcd/stream_stdio.c b/contrib/libvcd/stream_stdio.c
index 4eac0f6b3..4eac0f6b3 100644
--- a/src/input/vcd/libvcd/stream_stdio.c
+++ b/contrib/libvcd/stream_stdio.c
diff --git a/src/input/vcd/libvcd/stream_stdio.h b/contrib/libvcd/stream_stdio.h
index 46bca3140..46bca3140 100644
--- a/src/input/vcd/libvcd/stream_stdio.h
+++ b/contrib/libvcd/stream_stdio.h
diff --git a/src/input/vcd/libvcd/util.c b/contrib/libvcd/util.c
index a1e5c57d4..a1e5c57d4 100644
--- a/src/input/vcd/libvcd/util.c
+++ b/contrib/libvcd/util.c
diff --git a/src/input/vcd/libvcd/util.h b/contrib/libvcd/util.h
index c5a9ead7c..c5a9ead7c 100644
--- a/src/input/vcd/libvcd/util.h
+++ b/contrib/libvcd/util.h
diff --git a/src/input/vcd/libvcd/vcd.c b/contrib/libvcd/vcd.c
index 0772149ec..0772149ec 100644
--- a/src/input/vcd/libvcd/vcd.c
+++ b/contrib/libvcd/vcd.c
diff --git a/src/input/vcd/libvcd/vcd.h b/contrib/libvcd/vcd.h
index 7c001d282..7c001d282 100644
--- a/src/input/vcd/libvcd/vcd.h
+++ b/contrib/libvcd/vcd.h
diff --git a/src/input/vcd/libvcd/vcd_assert.h b/contrib/libvcd/vcd_assert.h
index c096b3677..c096b3677 100644
--- a/src/input/vcd/libvcd/vcd_assert.h
+++ b/contrib/libvcd/vcd_assert.h
diff --git a/src/input/vcd/libvcd/vcd_read.c b/contrib/libvcd/vcd_read.c
index dd9d30cfa..dd9d30cfa 100644
--- a/src/input/vcd/libvcd/vcd_read.c
+++ b/contrib/libvcd/vcd_read.c
diff --git a/src/input/vcd/libvcd/vcd_read.h b/contrib/libvcd/vcd_read.h
index fb9e1509b..fb9e1509b 100644
--- a/src/input/vcd/libvcd/vcd_read.h
+++ b/contrib/libvcd/vcd_read.h
diff --git a/m4/input.m4 b/m4/input.m4
index 76ad12ad9..9c86240e3 100644
--- a/m4/input.m4
+++ b/m4/input.m4
@@ -218,12 +218,12 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
                 fi
             fi
 
-            LIBCDIO_CFLAGS='-I$(top_srcdir)/src/input/vcd/libcdio'
-            LIBCDIO_LIBS='$(top_builddir)/src/input/vcd/libcdio/libcdio.la'
-            LIBISO9660_LIBS='$(top_builddir)/src/input/vcd/libcdio/libiso9660.la'
-            LIBVCD_CFLAGS='-I$(top_srcdir)/src/input/vcd/libvcd'
-            LIBVCD_LIBS='$(top_builddir)/src/input/vcd/libvcd/libvcd.la'
-            LIBVCDINFO_LIBS='$(top_builddir)/src/input/vcd/libvcd/libvcdinfo.la'
+            LIBCDIO_CFLAGS='-I$(top_srcdir)/contrib/libcdio'
+            LIBCDIO_LIBS='$(top_builddir)/contrib/libcdio/libcdio.la'
+            LIBISO9660_LIBS='$(top_builddir)/contrib/libcdio/libiso9660.la'
+            LIBVCD_CFLAGS='-I$(top_srcdir)/contrib/libvcd'
+            LIBVCD_LIBS='$(top_builddir)/contrib/libvcd/libvcd.la'
+            LIBVCDINFO_LIBS='$(top_builddir)/contrib/libvcd/libvcdinfo.la'
 
             case "$host_os" in
                 bsdi*)
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
index 3de899f7e..aa36ff65f 100644
--- a/src/input/vcd/Makefile.am
+++ b/src/input/vcd/Makefile.am
@@ -3,11 +3,6 @@ include $(top_srcdir)/misc/Makefile.common
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
-SUBDIRS =
-if !WITH_EXTERNAL_VCDLIBS
-SUBDIRS += libcdio libvcd
-endif
-
 noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h
 
 xineplug_LTLIBRARIES = xineplug_inp_vcd.la