Mercurial > libavformat.hg

changeset 2424:491a751cc58c libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Treat dc1394 as a library
author ramiro
date Tue, 04 Sep 2007 22:03:32 +0000
parents 91b61b76eb8c
children 8c51e92edd7d
files Makefile allformats.c allformats.h dc1394.c
diffstat 4 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Sep 04 17:33:35 2007 +0000
+++ b/Makefile	Tue Sep 04 22:03:32 2007 +0000
@@ -35,7 +35,6 @@
 OBJS-$(CONFIG_C93_DEMUXER)               += c93.o vocdec.o voc.o
 OBJS-$(CONFIG_CRC_MUXER)                 += crc.o
 OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o
-OBJS-$(CONFIG_DC1394_DEMUXER)            += dc1394.o
 OBJS-$(CONFIG_DSICIN_DEMUXER)            += dsicin.o
 OBJS-$(CONFIG_DTS_DEMUXER)               += raw.o
 OBJS-$(CONFIG_DV_DEMUXER)                += dv.o
@@ -153,6 +152,7 @@
 OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER)      += yuv4mpeg.o
 
 # external libraries
+OBJS-$(CONFIG_LIBDC1394_DEMUXER)         += dc1394.o
 OBJS-$(CONFIG_LIBNUT_DEMUXER)            += libnut.o riff.o
 OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o riff.o
 
--- a/allformats.c	Tue Sep 04 17:33:35 2007 +0000
+++ b/allformats.c	Tue Sep 04 22:03:32 2007 +0000
@@ -65,7 +65,6 @@
     REGISTER_DEMUXER (C93, c93);
     REGISTER_MUXER   (CRC, crc);
     REGISTER_DEMUXER (DAUD, daud);
-    REGISTER_DEMUXER (DC1394, dc1394);
     REGISTER_DEMUXER (DSICIN, dsicin);
     REGISTER_DEMUXER (DTS, dts);
     REGISTER_MUXDEMUX(DV, dv);
@@ -88,6 +87,7 @@
     REGISTER_MUXDEMUX(IMAGE2PIPE, image2pipe);
     REGISTER_DEMUXER (INGENIENT, ingenient);
     REGISTER_DEMUXER (IPMOVIE, ipmovie);
+    REGISTER_DEMUXER (LIBDC1394, libdc1394);
     if (!ENABLE_NUT_DEMUXER) REGISTER_DEMUXER (LIBNUT, libnut);
     if (!ENABLE_NUT_MUXER)   REGISTER_MUXER   (LIBNUT, libnut);
     REGISTER_MUXDEMUX(M4V, m4v);
--- a/allformats.h	Tue Sep 04 17:33:35 2007 +0000
+++ b/allformats.h	Tue Sep 04 22:03:32 2007 +0000
@@ -38,7 +38,6 @@
 extern AVInputFormat bethsoftvid_demuxer;
 extern AVInputFormat c93_demuxer;
 extern AVInputFormat daud_demuxer;
-extern AVInputFormat dc1394_demuxer;
 extern AVInputFormat dsicin_demuxer;
 extern AVInputFormat dts_demuxer;
 extern AVInputFormat dv1394_demuxer;
@@ -62,6 +61,7 @@
 extern AVInputFormat imagepipe_demuxer;
 extern AVInputFormat ingenient_demuxer;
 extern AVInputFormat ipmovie_demuxer;
+extern AVInputFormat libdc1394_demuxer;
 extern AVInputFormat libnut_demuxer;
 extern AVInputFormat m4v_demuxer;
 extern AVInputFormat matroska_demuxer;
--- a/dc1394.c	Tue Sep 04 17:33:35 2007 +0000
+++ b/dc1394.c	Tue Sep 04 22:03:32 2007 +0000
@@ -182,7 +182,7 @@
     return 0;
 }
 
-AVInputFormat dc1394_demuxer = {
+AVInputFormat libdc1394_demuxer = {
     .name           = "dc1394",
     .long_name      = "dc1394 A/V grab",
     .priv_data_size = sizeof(struct dc1394_data),