diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2007-09-04 22:03:32 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2007-09-04 22:03:32 +0000 |
| commit | f7b8bffe476ba3e0cfd208dadde79ddeae6c4bdd (patch) | |
| tree | eb6a7cba489965529cce7b9e28ae2ab309a83b3e /libavformat | |
| parent | 80a16ccf8249f43c84b6a4a12b1ee744d06fa4bc (diff) | |
Treat dc1394 as a library
Originally committed as revision 10292 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/allformats.h | 2 | ||||
| -rw-r--r-- | libavformat/dc1394.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 84e5a23675..11fd2cf652 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -35,7 +35,6 @@ OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o 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_MUXER) += yuv4mpeg.o 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 diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 468dd3e5f5..e18063531d 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -65,7 +65,6 @@ void av_register_all(void) 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 @@ void av_register_all(void) 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); diff --git a/libavformat/allformats.h b/libavformat/allformats.h index 73e942a436..4ae01e6e28 100644 --- a/libavformat/allformats.h +++ b/libavformat/allformats.h @@ -38,7 +38,6 @@ extern AVInputFormat avs_demuxer; 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 image_demuxer; 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; diff --git a/libavformat/dc1394.c b/libavformat/dc1394.c index bf140c4664..1a05818994 100644 --- a/libavformat/dc1394.c +++ b/libavformat/dc1394.c @@ -182,7 +182,7 @@ static int dc1394_close(AVFormatContext * context) return 0; } -AVInputFormat dc1394_demuxer = { +AVInputFormat libdc1394_demuxer = { .name = "dc1394", .long_name = "dc1394 A/V grab", .priv_data_size = sizeof(struct dc1394_data), |