Digital Camcorder support by Andrea Guzzo (xant at xant dot net).

THANKS

@@ -16,6 +16,7 @@ André de Barros Martins Ribeiro <andrerib at ajato.com.br> - Brazilian portugue
 Andre Pang <adre.pang at csiro dot au> - Annodex support
 Andres Krapf <dae at via.ecp.fr> - FreeBSD port and tests, KDE interface
 Andrey Brilevskiy <director at macwest.ru> - Russian translation
+Andrea Guzzo <xant at xant dot net> - Digital cameras support (dc1394)
 Andy Lindsay <andy_vl at ananam.com> - fixes in the TS demux
 Arkadiusz Lipiec <A.Lipiec at elka.pw.edu.pl> - Polish translation
 Arkadiusz Miskiewicz <misiek at pld.ORG.PL> - autoconf and Makefile patches

configure.ac

@@ -1607,6 +1607,37 @@ if test "${enable_live555}" = "yes"; then
   fi
 fi
 
+dnl
+dnl  special access module for dc1394 input
+dnl
+AC_ARG_ENABLE(dc1394,
+  [  --enable-dc1394       dc1394 access module (default disabled)])
+if test "${enable_dc1394}" = "yes"
+then
+  AC_CHECK_HEADERS(libraw1394/raw1394.h, [
+    AC_CHECK_LIB( raw1394, raw1394_get_nodecount, [
+        AC_CHECK_HEADERS(libdc1394/dc1394_control.h , [
+dnl         AC_CHECK_LIB( dc1394_control, dc1394_setup_capture, [
+              VLC_ADD_PLUGINS([dc1394])
+              VLC_ADD_LDFLAGS([dc1394],[-ldc1394_control -lraw1394])
+dnl         ],
+dnl         [
+dnl           AC_MSG_ERROR([libdc1394 are mandatory for dc1394 input module. try --disable-dc1394 or install those libraries])
+dnl         ])
+      ],
+      [
+        AC_MSG_ERROR([libdc1394 are mandatory for dc1394 input module. try --disable-dc1394 or install those libraries])
+      ])
+    ],
+    [
+      AC_MSG_ERROR([libraw1394 are mandatory for dc1394 input module. try --disable-dc1394 or install those libraries])
+    ])
+  ],
+  [
+    AC_MSG_ERROR([libraw1394 is mandatory for dc1394 input module. try --disable-dc1394 or install those libraries])
+  ])
+fi
+
 dnl
 dnl dv module: digital video module check for libraw1394
 dnl

extras/contrib/src/Makefile

@@ -191,10 +191,10 @@ else
    all: .iconv .intl .freetype .fribidi .zlib \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
-	.live .goom2k4 .caca .mod .x264  .xml .twolame\
-	.png .gpg-error .gcrypt .gnutls .mpcdec\
+	.live .goom2k4 .caca .mod .x264  .xml .twolame \
+	.png .gpg-error .gcrypt .gnutls .mpcdec \
 	.dvdnav .dvbpsi .wxwidgets .dirac \
-	.aclocal .libdca
+	.aclocal .libdca .libraw1394 .libdc1394
 #	.png .gpg-error .gcrypt .gnutls .mpcdec\
 #	.SDL_image  .daap .cddb .cdio .vcdimager 
    endif
@@ -1507,6 +1507,68 @@ endif
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls --disable-shared && make && make install)
 #	$(INSTALL_NAME)
 	touch $@
+# libraw1394
+# ***************************************************************************
+
+#ifdef SVN
+#libraw1394:
+#	$(SVN) co -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394  libraw1394
+#        (cd $<; libtoolize --copy --force; \
+#                autopoint -f; \
+#                aclocal -I extras/contrib/share/aclocal; \
+#                autoconf; \
+#                autoheader; \
+#                automake --add-missing --copy -Wall)
+#
+#else
+libraw1394-$(LIBRAW1394_VERSION).tar.gz:
+	$(WGET) $(LIBRAW1394_URL)
+
+libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz
+	$(EXTRACT_GZ)
+#endif
+
+.libraw1394: libraw1394
+	(cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PRFIX) install)
+	touch $@
+	
+CLEAN_file += .libraw1394
+CLEAN_PKG += libraw1394
+DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION)
+
+# ***************************************************************************
+# libdc1394
+# ***************************************************************************
+
+#ifdef SVN
+#libdc1394:
+#	$(SVN) co -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394  libdc1394
+#        (cd $<; libtoolize --copy --force; \
+#                autopoint -f; \
+#                aclocal -I extras/contrib/share/aclocal; \
+#                autoconf; \
+#                autoheader; \
+#                automake --add-missing --copy -Wall)
+#
+#else
+libdc1394-$(LIBDC1394_VERSION).tar.gz:
+	$(WGET) $(LIBDC1394_URL)
+
+libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz
+	$(EXTRACT_GZ)
+#endif
+
+.libdc1394: libdc1394
+	(cd $<; ./configure --prefix=$(PREFIX) && \
+	 patch -p1 < ../Patches/libdc1394-noexamples.patch && \
+	 make && make DESTDIR=$(PRFIX) install)
+	touch $@
+	
+CLEAN_file += .libdc1394
+CLEAN_PKG += libdc1394
+DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION)
+
+# ***************************************************************************
 
 CLEAN_FILE += .gpg-error
 CLEAN_PKG += libgpg-error

extras/contrib/src/packages.mak

@@ -99,6 +99,12 @@ GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz
 LIBCACA_VERSION=0.9
 LIBCACA_URL=http://libcaca.zoy.org/files/libcaca-$(LIBCACA_VERSION).tar.gz
 LIBDTS_VERSION=0.0.2
+LIBDC1394_VERSION=1.2.1
+LIBDC1394_URL=http://surfnet.dl.sourceforge.net/sourceforge/libdc1394/libdc1394-$(LIBDC1394_VERSION).tar.gz
+LIBDC1394_SVN=https://svn.sourceforge.net/svnroot
+LIBRAW1394_VERSION=1.2.0
+LIBRAW1394_URL=http://surfnet.dl.sourceforge.net/sourceforge/libraw1394/libraw1394-$(LIBRAW1394_VERSION).tar.gz
+LIBRAW1394_SVN=https://svn.sourceforge.net/svnroot
 LIBDTS_URL=http://debian.unnet.nl/pub/videolan/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz
 LIBDCA_SVN=svn://svn.videolan.org/libdca/trunk
 MODPLUG_VERSION=0.8

modules/access/Modules.am

@@ -9,6 +9,7 @@ SOURCES_access_smb = smb.c
 SOURCES_access_gnomevfs = gnomevfs.c
 SOURCES_dvdnav = dvdnav.c
 SOURCES_dvdread = dvdread.c
+SOURCES_dc1394 = dc1394.c
 SOURCES_access_fake = fake.c
 SOURCES_cdda = \
         cdda.c \