[FFmpeg-cvslog] r11077 - in trunk: Changelog Makefile configure ffmpeg.c ffplay.c libavdevice libavdevice/Makefile libavdevice/alldevices.c libavdevice/audio.c libavdevice/avdevice.h libavdevice/beosaudio.cpp libavdevice/bktr.c libavdevice/dv1394.c libavdevice/dv1394.h libavdevice/libdc1394.c libavdevice/v4l.c libavdevice/v4l2.c libavdevice/x11grab.c libavformat/Makefile libavformat/allformats.c libavformat/audio.c libavformat/beosaudio.cpp libavformat/bktr.c libavformat/dv1394.c libavformat/dv1394.h libavformat/libdc1394.c libavformat/v4l.c libavformat/v4l2.c libavformat/x11grab.c
lucabe
subversion
Thu Nov 22 17:10:05 CET 2007
Author: lucabe
Date: Thu Nov 22 17:10:02 2007
New Revision: 11077
Log:
Introduce libavdevice
Added:
trunk/libavdevice/
trunk/libavdevice/Makefile
- copied, changed from r11076, /trunk/libavformat/Makefile
trunk/libavdevice/alldevices.c
- copied, changed from r11076, /trunk/libavformat/allformats.c
trunk/libavdevice/audio.c
- copied unchanged from r11076, /trunk/libavformat/audio.c
trunk/libavdevice/avdevice.h
trunk/libavdevice/beosaudio.cpp
- copied unchanged from r11076, /trunk/libavformat/beosaudio.cpp
trunk/libavdevice/bktr.c
- copied unchanged from r11076, /trunk/libavformat/bktr.c
trunk/libavdevice/dv1394.c
- copied unchanged from r11076, /trunk/libavformat/dv1394.c
trunk/libavdevice/dv1394.h
- copied unchanged from r11076, /trunk/libavformat/dv1394.h
trunk/libavdevice/libdc1394.c
- copied unchanged from r11076, /trunk/libavformat/libdc1394.c
trunk/libavdevice/v4l.c
- copied unchanged from r11076, /trunk/libavformat/v4l.c
trunk/libavdevice/v4l2.c
- copied unchanged from r11076, /trunk/libavformat/v4l2.c
trunk/libavdevice/x11grab.c
- copied unchanged from r11076, /trunk/libavformat/x11grab.c
Removed:
trunk/libavformat/audio.c
trunk/libavformat/beosaudio.cpp
trunk/libavformat/bktr.c
trunk/libavformat/dv1394.c
trunk/libavformat/dv1394.h
trunk/libavformat/libdc1394.c
trunk/libavformat/v4l.c
trunk/libavformat/v4l2.c
trunk/libavformat/x11grab.c
Modified:
trunk/Changelog
trunk/Makefile
trunk/configure
trunk/ffmpeg.c
trunk/ffplay.c
trunk/libavformat/Makefile
trunk/libavformat/allformats.c
Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog (original)
+++ trunk/Changelog Thu Nov 22 17:10:02 2007
@@ -1,4 +1,5 @@
version <next>
+- The "device" muxers and demuxers are now in a new libavdevice library
- DV50 AKA DVCPRO50 encoder, decoder, muxer and demuxer
- TechSmith Camtasia (TSCC) video decoder
- IBM Ultimotion (ULTI) video decoder
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Nov 22 17:10:02 2007
@@ -8,6 +8,7 @@ VPATH=$(SRC_PATH_BARE)
CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
-I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \
+ -I$(SRC_PATH)/libavdevice \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE -DHAVE_AV_CONFIG_H
LDFLAGS+= -g
@@ -25,9 +26,9 @@ ALLPROGS_G = $(addsuffix _g$(EXESUF), $
ALLMANPAGES = $(addsuffix .1, $(BASENAMES))
ifeq ($(BUILD_SHARED),yes)
-DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
+DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavdevice/$(SLIBPREF)avdevice$(SLIBSUF)
else
-DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
+DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavdevice/$(LIBPREF)avdevice$(LIBSUF)
endif
ALL_TARGETS-$(CONFIG_VHOOK) += videohook
@@ -60,8 +61,8 @@ LIBS_drawtext$(SLIBSUF) = `freety
VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c
-LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
-EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
+LDFLAGS := -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
+EXTRALIBS := -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
ifeq ($(CONFIG_SWSCALER),yes)
LDFLAGS+=-L$(BUILD_ROOT)/libswscale
@@ -74,6 +75,7 @@ lib:
$(MAKE) -C libavutil all
$(MAKE) -C libavcodec all
$(MAKE) -C libavformat all
+ $(MAKE) -C libavdevice all
ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libpostproc all
endif
@@ -165,6 +167,7 @@ install-libs:
$(MAKE) -C libavutil install-libs
$(MAKE) -C libavcodec install-libs
$(MAKE) -C libavformat install-libs
+ $(MAKE) -C libavdevice install-libs
ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libpostproc install-libs
endif
@@ -180,6 +183,7 @@ install-headers:
$(MAKE) -C libavutil install-headers
$(MAKE) -C libavcodec install-headers
$(MAKE) -C libavformat install-headers
+ $(MAKE) -C libavdevice install-headers
ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libpostproc install-headers
endif
@@ -201,6 +205,7 @@ uninstall-libs:
$(MAKE) -C libavutil uninstall-libs
$(MAKE) -C libavcodec uninstall-libs
$(MAKE) -C libavformat uninstall-libs
+ $(MAKE) -C libavdevice uninstall-libs
$(MAKE) -C libpostproc uninstall-libs
$(MAKE) -C libswscale uninstall-libs
@@ -208,6 +213,7 @@ uninstall-headers:
$(MAKE) -C libavutil uninstall-headers
$(MAKE) -C libavcodec uninstall-headers
$(MAKE) -C libavformat uninstall-headers
+ $(MAKE) -C libavdevice uninstall-headers
$(MAKE) -C libpostproc uninstall-headers
$(MAKE) -C libswscale uninstall-headers
-rmdir "$(INCDIR)"
@@ -216,6 +222,7 @@ depend dep: .depend .vhookdep
$(MAKE) -C libavutil depend
$(MAKE) -C libavcodec depend
$(MAKE) -C libavformat depend
+ $(MAKE) -C libavdevice depend
ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libpostproc depend
endif
@@ -239,6 +246,7 @@ clean:
$(MAKE) -C libavutil clean
$(MAKE) -C libavcodec clean
$(MAKE) -C libavformat clean
+ $(MAKE) -C libavdevice clean
$(MAKE) -C libpostproc clean
$(MAKE) -C libswscale clean
rm -f *.o *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
@@ -252,6 +260,7 @@ distclean: clean
$(MAKE) -C libavutil distclean
$(MAKE) -C libavcodec distclean
$(MAKE) -C libavformat distclean
+ $(MAKE) -C libavdevice distclean
$(MAKE) -C libpostproc distclean
$(MAKE) -C libswscale distclean
rm -f .depend .vhookdep version.h config.* *.pc
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Thu Nov 22 17:10:02 2007
@@ -920,9 +920,11 @@ PARSER_LIST=`sed -n 's/^[^#]*PARSER.*(.*
BSF_LIST=`sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' "$source_path/libavcodec/allcodecs.c"`
MUXER_LIST=`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' "$source_path/libavformat/allformats.c"`
DEMUXER_LIST=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' "$source_path/libavformat/allformats.c"`
+INDEV_LIST=`sed -n 's/^[^#]*_IN.*(.*, *\(.*\)).*/\1_demuxer/p' "$source_path/libavdevice/alldevices.c"`
+OUTDEV_LIST=`sed -n 's/^[^#]*OUTDEV.*(.*, *\(.*\)).*/\1_muxer/p' "$source_path/libavdevice/alldevices.c"`
PROTOCOL_LIST=`sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' "$source_path/libavformat/allformats.c"`
-enable $ENCODER_LIST $DECODER_LIST $PARSER_LIST $MUXER_LIST $DEMUXER_LIST $PROTOCOL_LIST $BSF_LIST
+enable $ENCODER_LIST $DECODER_LIST $PARSER_LIST $MUXER_LIST $DEMUXER_LIST $PROTOCOL_LIST $BSF_LIST $INDEV_LIST $OUTDEV_LIST
enable $ARCH_EXT_LIST
die_unknown(){
@@ -1729,13 +1731,16 @@ enabled_any $ENCODER_LIST && enable enc
enabled_any $DECODER_LIST && enable decoders
enabled_any $MUXER_LIST && enable muxers
enabled_any $DEMUXER_LIST && enable demuxers
+enabled_any $OUTDEV_LIST && enable muxers
+enabled_any $INDEV_LIST && enable demuxers
enabled_any $PROTOCOL_LIST && enable protocols
enabled_any $BSF_LIST && enable bsfs
enabled_any $THREADS_LIST && enable threads
check_deps $CONFIG_LIST $HAVE_LIST $DECODER_LIST $ENCODER_LIST $PARSER_LIST \
- $BSF_LIST $DEMUXER_LIST $MUXER_LIST $PROTOCOL_LIST
+ $BSF_LIST $DEMUXER_LIST $MUXER_LIST $PROTOCOL_LIST \
+ $INDEV_LIST $OUTDEV_LIST
enabled libdc1394 && append pkg_requires "libraw1394"
enabled libtheora && append pkg_requires "theora"
@@ -1888,6 +1893,7 @@ fi
sws_version=`grep '#define LIBSWSCALE_VERSION ' "$source_path/libswscale/swscale.h" | sed 's/[^0-9\.]//g'`
pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libpostproc/postprocess.h" | sed 's/[^0-9\.]//g'`
lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]//g'`
+lavd_version=`grep '#define LIBAVDEVICE_VERSION ' "$source_path/libavdevice/avdevice.h" | sed 's/[^0-9\.]//g'`
lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]//g'`
lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'`
@@ -1900,6 +1906,8 @@ if enabled shared; then
echo "SPPVERSION=$pp_version" >> config.mak
echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
echo "LAVCVERSION=$lavc_version" >> config.mak
+ echo "LAVDMAJOR=${lavd_version%%.*}" >> config.mak
+ echo "LAVDVERSION=$lavd_version" >> config.mak
echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak
echo "LAVFVERSION=$lavf_version" >> config.mak
echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
@@ -1926,6 +1934,8 @@ print_config CONFIG_ $TMPH config.mak $C
$DEMUXER_LIST \
$MUXER_LIST \
$PROTOCOL_LIST \
+ $INDEV_LIST \
+ $OUTDEV_LIST \
echo "#define restrict $_restrict" >> $TMPH
@@ -2050,6 +2060,8 @@ pkgconfig_generate_uninstalled libavcode
pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version" ffmpeg
pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
+pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "$pkg_requires libavformat = $lavf_version" ffmpeg
+pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version"
if enabled pp; then
pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$pp_version"
Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c (original)
+++ trunk/ffmpeg.c Thu Nov 22 17:10:02 2007
@@ -28,6 +28,7 @@
#include <signal.h>
#include <limits.h>
#include "avformat.h"
+#include "avdevice.h"
#include "swscale.h"
#include "framehook.h"
#include "opt.h"
@@ -3884,6 +3885,8 @@ int main(int argc, char **argv)
int i;
int64_t ti;
+ avcodec_register_all();
+ avdevice_register_all();
av_register_all();
for(i=0; i<CODEC_TYPE_NB; i++){
Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c (original)
+++ trunk/ffplay.c Thu Nov 22 17:10:02 2007
@@ -22,6 +22,7 @@
#include <math.h>
#include <limits.h>
#include "avformat.h"
+#include "avdevice.h"
#include "rtsp.h"
#include "swscale.h"
#include "avstring.h"
@@ -2517,6 +2518,8 @@ int main(int argc, char **argv)
int flags;
/* register all codecs, demux and protocols */
+ avcodec_register_all();
+ avdevice_register_all();
av_register_all();
show_banner(program_name, program_birth_year);
Copied: trunk/libavdevice/Makefile (from r11076, /trunk/libavformat/Makefile)
==============================================================================
--- /trunk/libavformat/Makefile (original)
+++ trunk/libavdevice/Makefile Thu Nov 22 17:10:02 2007
@@ -1,187 +1,28 @@
-#
-# libavformat Makefile
-# (c) 2000-2003 Fabrice Bellard
-#
include ../config.mak
-CFLAGS += -I$(SRC_PATH)/libavcodec
+NAME=avdevice
+LIBVERSION=$(LAVDVERSION)
+LIBMAJOR=$(LAVDMAJOR)
-OBJS = allformats.o cutils.o os_support.o sdp.o utils.o
+CFLAGS += -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat
-HEADERS = avformat.h avio.h rtp.h rtsp.h rtspcodes.h
+OBJS = alldevices.o
-# muxers/demuxers
-OBJS-$(CONFIG_AAC_DEMUXER) += raw.o
-OBJS-$(CONFIG_AC3_DEMUXER) += raw.o
-OBJS-$(CONFIG_AC3_MUXER) += raw.o
-OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o
-OBJS-$(CONFIG_AIFF_DEMUXER) += aiff.o riff.o raw.o
-OBJS-$(CONFIG_AIFF_MUXER) += aiff.o riff.o
-OBJS-$(CONFIG_AMR_DEMUXER) += amr.o
-OBJS-$(CONFIG_AMR_MUXER) += amr.o
-OBJS-$(CONFIG_APC_DEMUXER) += apc.o
-OBJS-$(CONFIG_APE_DEMUXER) += ape.o
-OBJS-$(CONFIG_ASF_DEMUXER) += asf.o asfcrypt.o riff.o
-OBJS-$(CONFIG_ASF_MUXER) += asf-enc.o riff.o
-OBJS-$(CONFIG_ASF_STREAM_MUXER) += asf-enc.o riff.o
-OBJS-$(CONFIG_AU_DEMUXER) += au.o raw.o
-OBJS-$(CONFIG_AU_MUXER) += au.o
-OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o
-OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o
-OBJS-$(CONFIG_AVISYNTH) += avisynth.o
-OBJS-$(CONFIG_AVS_DEMUXER) += avs.o vocdec.o voc.o
-OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o
+HEADERS = avdevice.h
+
+# input/output devices
OBJS-$(CONFIG_BKTR_DEMUXER) += bktr.o
-OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o
-OBJS-$(CONFIG_CRC_MUXER) += crcenc.o
-OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o
-OBJS-$(CONFIG_DSICIN_DEMUXER) += dsicin.o
-OBJS-$(CONFIG_DTS_DEMUXER) += raw.o
-OBJS-$(CONFIG_DV_DEMUXER) += dv.o
-OBJS-$(CONFIG_DV_MUXER) += dvenc.o
-OBJS-$(CONFIG_DV1394_DEMUXER) += dv1394.o dv.o
-OBJS-$(CONFIG_DXA_DEMUXER) += dxa.o riff.o
-OBJS-$(CONFIG_EA_CDATA_DEMUXER) += eacdata.o
-OBJS-$(CONFIG_EA_DEMUXER) += electronicarts.o
-OBJS-$(CONFIG_FFM_DEMUXER) += ffm.o
-OBJS-$(CONFIG_FFM_MUXER) += ffm.o
-OBJS-$(CONFIG_FLAC_DEMUXER) += raw.o
-OBJS-$(CONFIG_FLAC_MUXER) += raw.o
-OBJS-$(CONFIG_FLIC_DEMUXER) += flic.o
-OBJS-$(CONFIG_FLV_DEMUXER) += flvdec.o
-OBJS-$(CONFIG_FLV_MUXER) += flvenc.o
-OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o
-OBJS-$(CONFIG_FRAMECRC_MUXER) += framecrcenc.o
-OBJS-$(CONFIG_GIF_MUXER) += gif.o
-OBJS-$(CONFIG_GIF_DEMUXER) += gifdec.o
-OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o
-OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o
-OBJS-$(CONFIG_H261_DEMUXER) += raw.o
-OBJS-$(CONFIG_H261_MUXER) += raw.o
-OBJS-$(CONFIG_H263_DEMUXER) += raw.o
-OBJS-$(CONFIG_H263_MUXER) += raw.o
-OBJS-$(CONFIG_H264_DEMUXER) += raw.o
-OBJS-$(CONFIG_H264_MUXER) += raw.o
-OBJS-$(CONFIG_IDCIN_DEMUXER) += idcin.o
-OBJS-$(CONFIG_IMAGE2_DEMUXER) += img2.o
-OBJS-$(CONFIG_IMAGE2_MUXER) += img2.o
-OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2.o
-OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2.o
-OBJS-$(CONFIG_INGENIENT_DEMUXER) += raw.o
-OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o
-OBJS-$(CONFIG_M4V_DEMUXER) += raw.o
-OBJS-$(CONFIG_M4V_MUXER) += raw.o
-OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += matroskaenc.o matroska.o riff.o
-OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o riff.o
-OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o riff.o
-OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o
-OBJS-$(CONFIG_MJPEG_MUXER) += raw.o
-OBJS-$(CONFIG_MM_DEMUXER) += mm.o
-OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o raw.o
-OBJS-$(CONFIG_MMF_MUXER) += mmf.o riff.o
-OBJS-$(CONFIG_MOV_DEMUXER) += mov.o riff.o isom.o
-OBJS-$(CONFIG_MOV_MUXER) += movenc.o riff.o isom.o
-OBJS-$(CONFIG_MP2_MUXER) += mp3.o
-OBJS-$(CONFIG_MP3_DEMUXER) += mp3.o
-OBJS-$(CONFIG_MP3_MUXER) += mp3.o
-OBJS-$(CONFIG_MP4_MUXER) += movenc.o riff.o isom.o
-OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o
-OBJS-$(CONFIG_MPC8_DEMUXER) += mpc8.o
-OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpegenc.o
-OBJS-$(CONFIG_MPEG1VCD_MUXER) += mpegenc.o
-OBJS-$(CONFIG_MPEG2DVD_MUXER) += mpegenc.o
-OBJS-$(CONFIG_MPEG2VOB_MUXER) += mpegenc.o
-OBJS-$(CONFIG_MPEG2SVCD_MUXER) += mpegenc.o
-OBJS-$(CONFIG_MPEG1VIDEO_MUXER) += raw.o
-OBJS-$(CONFIG_MPEG2VIDEO_MUXER) += raw.o
-OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.o
-OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o
-OBJS-$(CONFIG_MPEGTSRAW_DEMUXER) += mpegts.o
-OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o
-OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += raw.o
-OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o
-OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o
-OBJS-$(CONFIG_MXF_DEMUXER) += mxf.o
-OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o
-OBJS-$(CONFIG_NULL_MUXER) += raw.o
-OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o riff.o
-OBJS-$(CONFIG_NUT_MUXER) += nutenc.o nut.o riff.o
-OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o riff.o
-OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \
- oggparsevorbis.o \
- oggparsetheora.o \
- oggparseflac.o \
- oggparseogm.o \
- riff.o
-OBJS-$(CONFIG_OGG_MUXER) += oggenc.o
+OBJS-$(CONFIG_DV1394_DEMUXER) += dv1394.o
OBJS-$(CONFIG_OSS_DEMUXER) += audio.o
OBJS-$(CONFIG_OSS_MUXER) += audio.o
-OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o
-OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += raw.o
-OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.o
-OBJS-$(CONFIG_REDIR_DEMUXER) += rtsp.o
-OBJS-$(CONFIG_RM_DEMUXER) += rmdec.o
-OBJS-$(CONFIG_RM_MUXER) += rmenc.o
-OBJS-$(CONFIG_ROQ_DEMUXER) += idroq.o
-OBJS-$(CONFIG_ROQ_MUXER) += raw.o
-OBJS-$(CONFIG_RTP_MUXER) += rtp.o rtp_h264.o rtp_mpv.o rtp_aac.o
-OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o
-OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o
-OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o
-OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o
-OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o
-OBJS-$(CONFIG_SMACKER_DEMUXER) += smacker.o
-OBJS-$(CONFIG_SOL_DEMUXER) += sol.o raw.o
-OBJS-$(CONFIG_STR_DEMUXER) += psxstr.o
-OBJS-$(CONFIG_SWF_DEMUXER) += swf.o
-OBJS-$(CONFIG_SWF_MUXER) += swf.o
-OBJS-$(CONFIG_TG2_MUXER) += movenc.o riff.o isom.o
-OBJS-$(CONFIG_TGP_MUXER) += movenc.o riff.o isom.o
-OBJS-$(CONFIG_THP_DEMUXER) += thp.o
-OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o
-OBJS-$(CONFIG_TTA_DEMUXER) += tta.o
-OBJS-$(CONFIG_TXD_DEMUXER) += txd.o
OBJS-$(CONFIG_V4L2_DEMUXER) += v4l2.o
OBJS-$(CONFIG_V4L_DEMUXER) += v4l.o
-OBJS-$(CONFIG_VC1_DEMUXER) += raw.o
-OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.o
-OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.o voc.o
-OBJS-$(CONFIG_VOC_MUXER) += vocenc.o voc.o
-OBJS-$(CONFIG_WAV_DEMUXER) += wav.o riff.o raw.o
-OBJS-$(CONFIG_WAV_MUXER) += wav.o riff.o
-OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o
-OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o
-OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o
-OBJS-$(CONFIG_WV_DEMUXER) += wv.o
OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER) += x11grab.o
-OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o
-OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o
# external libraries
OBJS-$(CONFIG_LIBDC1394_DEMUXER) += libdc1394.o
-OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o riff.o
-OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o
-
-OBJS-$(CONFIG_VHOOK) += framehook.o
-
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
- -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
CPPOBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o
CPPOBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o
-# protocols I/O
-OBJS+= avio.o aviobuf.o
-
-OBJS-$(CONFIG_FILE_PROTOCOL) += file.o
-OBJS-$(CONFIG_HTTP_PROTOCOL) += http.o
-OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o
-OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o
-OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
-OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
-
-NAME=avformat
-LIBVERSION=$(LAVFVERSION)
-LIBMAJOR=$(LAVFMAJOR)
-
include ../common.mak
Copied: trunk/libavdevice/alldevices.c (from r11076, /trunk/libavformat/allformats.c)
==============================================================================
--- /trunk/libavformat/allformats.c (original)
+++ trunk/libavdevice/alldevices.c Thu Nov 22 17:10:02 2007
@@ -1,6 +1,5 @@
/*
- * Register all the formats and protocols
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
+ * Register all the grabbing devices.
*
* This file is part of FFmpeg.
*
@@ -19,26 +18,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
-#include "rtp_internal.h"
+#include "avdevice.h"
-#define REGISTER_MUXER(X,x) { \
+#define REGISTER_OUTDEV(X,x) { \
extern AVOutputFormat x##_muxer; \
if(ENABLE_##X##_MUXER) av_register_output_format(&x##_muxer); }
-#define REGISTER_DEMUXER(X,x) { \
+#define REGISTER_INDEV(X,x) { \
extern AVInputFormat x##_demuxer; \
if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer); }
-#define REGISTER_MUXDEMUX(X,x) REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x)
-#define REGISTER_PROTOCOL(X,x) { \
- extern URLProtocol x##_protocol; \
- if(ENABLE_##X##_PROTOCOL) register_protocol(&x##_protocol); }
-
-/* If you do not call this function, then you can select exactly which
- formats you want to support */
+#define REGISTER_INOUTDEV(X,x) REGISTER_INDEV(X,x); REGISTER_OUTDEV(X,x)
-/**
- * Initialize libavformat and register all the (de)muxers and protocols.
- */
-void av_register_all(void)
+void avdevice_register_all(void)
{
static int inited;
@@ -46,138 +36,15 @@ void av_register_all(void)
return;
inited = 1;
- avcodec_init();
- avcodec_register_all();
-
- /* (de)muxers */
- REGISTER_DEMUXER (AAC, aac);
- REGISTER_MUXDEMUX (AC3, ac3);
- REGISTER_MUXER (ADTS, adts);
- REGISTER_MUXDEMUX (AIFF, aiff);
- REGISTER_MUXDEMUX (AMR, amr);
- REGISTER_DEMUXER (APC, apc);
- REGISTER_DEMUXER (APE, ape);
- REGISTER_MUXDEMUX (ASF, asf);
- REGISTER_MUXER (ASF_STREAM, asf_stream);
- REGISTER_MUXDEMUX (AU, au);
- REGISTER_MUXDEMUX (AUDIO_BEOS, audio_beos);
- REGISTER_MUXDEMUX (AVI, avi);
- REGISTER_DEMUXER (AVISYNTH, avisynth);
- REGISTER_DEMUXER (AVS, avs);
- REGISTER_DEMUXER (BETHSOFTVID, bethsoftvid);
- REGISTER_DEMUXER (BKTR, bktr);
- REGISTER_DEMUXER (C93, c93);
- REGISTER_MUXER (CRC, crc);
- REGISTER_DEMUXER (DAUD, daud);
- REGISTER_DEMUXER (DSICIN, dsicin);
- REGISTER_DEMUXER (DTS, dts);
- REGISTER_MUXDEMUX (DV, dv);
- REGISTER_DEMUXER (DV1394, dv1394);
- REGISTER_DEMUXER (DXA, dxa);
- REGISTER_DEMUXER (EA, ea);
- REGISTER_DEMUXER (EA_CDATA, ea_cdata);
- REGISTER_MUXDEMUX (FFM, ffm);
- REGISTER_MUXDEMUX (FLAC, flac);
- REGISTER_DEMUXER (FLIC, flic);
- REGISTER_MUXDEMUX (FLV, flv);
- REGISTER_DEMUXER (FOURXM, fourxm);
- REGISTER_MUXER (FRAMECRC, framecrc);
- REGISTER_MUXDEMUX (GIF, gif);
- REGISTER_MUXDEMUX (GXF, gxf);
- REGISTER_MUXDEMUX (H261, h261);
- REGISTER_MUXDEMUX (H263, h263);
- REGISTER_MUXDEMUX (H264, h264);
- REGISTER_DEMUXER (IDCIN, idcin);
- REGISTER_MUXDEMUX (IMAGE2, image2);
- REGISTER_MUXDEMUX (IMAGE2PIPE, image2pipe);
- REGISTER_DEMUXER (INGENIENT, ingenient);
- REGISTER_DEMUXER (IPMOVIE, ipmovie);
- REGISTER_MUXDEMUX (M4V, m4v);
- REGISTER_MUXDEMUX (MATROSKA, matroska);
- REGISTER_MUXER (MATROSKA_AUDIO, matroska_audio);
- REGISTER_MUXDEMUX (MJPEG, mjpeg);
- REGISTER_DEMUXER (MM, mm);
- REGISTER_MUXDEMUX (MMF, mmf);
- REGISTER_MUXDEMUX (MOV, mov);
- REGISTER_MUXER (MP2, mp2);
- REGISTER_MUXDEMUX (MP3, mp3);
- REGISTER_MUXER (MP4, mp4);
- REGISTER_DEMUXER (MPC, mpc);
- REGISTER_DEMUXER (MPC8, mpc8);
- REGISTER_MUXER (MPEG1SYSTEM, mpeg1system);
- REGISTER_MUXER (MPEG1VCD, mpeg1vcd);
- REGISTER_MUXER (MPEG1VIDEO, mpeg1video);
- REGISTER_MUXER (MPEG2DVD, mpeg2dvd);
- REGISTER_MUXER (MPEG2SVCD, mpeg2svcd);
- REGISTER_MUXER (MPEG2VIDEO, mpeg2video);
- REGISTER_MUXER (MPEG2VOB, mpeg2vob);
- REGISTER_DEMUXER (MPEGPS, mpegps);
- REGISTER_MUXDEMUX (MPEGTS, mpegts);
- REGISTER_DEMUXER (MPEGTSRAW, mpegtsraw);
- REGISTER_DEMUXER (MPEGVIDEO, mpegvideo);
- REGISTER_MUXER (MPJPEG, mpjpeg);
- REGISTER_DEMUXER (MTV, mtv);
- REGISTER_DEMUXER (MXF, mxf);
- REGISTER_DEMUXER (NSV, nsv);
- REGISTER_MUXER (NULL, null);
- REGISTER_MUXDEMUX (NUT, nut);
- REGISTER_DEMUXER (NUV, nuv);
- REGISTER_MUXDEMUX (OGG, ogg);
- REGISTER_MUXDEMUX (OSS, oss);
- REGISTER_MUXDEMUX (PCM_ALAW, pcm_alaw);
- REGISTER_MUXDEMUX (PCM_MULAW, pcm_mulaw);
- REGISTER_MUXDEMUX (PCM_S16BE, pcm_s16be);
- REGISTER_MUXDEMUX (PCM_S16LE, pcm_s16le);
- REGISTER_MUXDEMUX (PCM_S8, pcm_s8);
- REGISTER_MUXDEMUX (PCM_U16BE, pcm_u16be);
- REGISTER_MUXDEMUX (PCM_U16LE, pcm_u16le);
- REGISTER_MUXDEMUX (PCM_U8, pcm_u8);
- REGISTER_MUXER (PSP, psp);
- REGISTER_MUXDEMUX (RAWVIDEO, rawvideo);
- REGISTER_MUXDEMUX (RM, rm);
- REGISTER_MUXDEMUX (ROQ, roq);
- REGISTER_DEMUXER (REDIR, redir);
- REGISTER_MUXER (RTP, rtp);
- REGISTER_DEMUXER (RTSP, rtsp);
- REGISTER_DEMUXER (SDP, sdp);
-#ifdef CONFIG_RTP_MUXER
- av_register_rtp_dynamic_payload_handlers();
-#endif
- REGISTER_DEMUXER (SEGAFILM, segafilm);
- REGISTER_DEMUXER (SHORTEN, shorten);
- REGISTER_DEMUXER (SIFF, siff);
- REGISTER_DEMUXER (SMACKER, smacker);
- REGISTER_DEMUXER (SOL, sol);
- REGISTER_DEMUXER (STR, str);
- REGISTER_MUXDEMUX (SWF, swf);
- REGISTER_MUXER (TG2, tg2);
- REGISTER_MUXER (TGP, tgp);
- REGISTER_DEMUXER (THP, thp);
- REGISTER_DEMUXER (TIERTEXSEQ, tiertexseq);
- REGISTER_DEMUXER (TTA, tta);
- REGISTER_DEMUXER (TXD, txd);
- REGISTER_DEMUXER (V4L2, v4l2);
- REGISTER_DEMUXER (V4L, v4l);
- REGISTER_DEMUXER (VC1, vc1);
- REGISTER_DEMUXER (VMD, vmd);
- REGISTER_MUXDEMUX (VOC, voc);
- REGISTER_MUXDEMUX (WAV, wav);
- REGISTER_DEMUXER (WC3, wc3);
- REGISTER_DEMUXER (WSAUD, wsaud);
- REGISTER_DEMUXER (WSVQA, wsvqa);
- REGISTER_DEMUXER (WV, wv);
- REGISTER_DEMUXER (X11_GRAB_DEVICE, x11_grab_device);
- REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe);
+ /* devices */
+ REGISTER_INOUTDEV (AUDIO_BEOS, audio_beos);
+ REGISTER_INDEV (BKTR, bktr);
+ REGISTER_INDEV (DV1394, dv1394);
+ REGISTER_INOUTDEV (OSS, oss);
+ REGISTER_INDEV (V4L2, v4l2);
+ REGISTER_INDEV (V4L, v4l);
+ REGISTER_INDEV (X11_GRAB_DEVICE, x11_grab_device);
/* external libraries */
- REGISTER_DEMUXER (LIBDC1394, libdc1394);
- REGISTER_MUXDEMUX (LIBNUT, libnut);
-
- /* protocols */
- REGISTER_PROTOCOL (FILE, file);
- REGISTER_PROTOCOL (HTTP, http);
- REGISTER_PROTOCOL (PIPE, pipe);
- REGISTER_PROTOCOL (RTP, rtp);
- REGISTER_PROTOCOL (TCP, tcp);
- REGISTER_PROTOCOL (UDP, udp);
+ REGISTER_INDEV (LIBDC1394, libdc1394);
}
Added: trunk/libavdevice/avdevice.h
==============================================================================
--- (empty file)
+++ trunk/libavdevice/avdevice.h Thu Nov 22 17:10:02 2007
@@ -0,0 +1,33 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef FFMPEG_AVDEVICE_H
+#define FFMPEG_AVDEVICE_H
+
+#define LIBAVDEVICE_VERSION_INT ((52<<16)+(0<<8)+0)
+#define LIBAVDEVICE_VERSION 52.0.0
+#define LIBAVDEVICE_BUILD LIBAVDEVICE_VERSION_INT
+
+/**
+ * Initialize libavdevice and register all the input and output devices.
+ * @warning This function is not thread safe.
+ */
+void avdevice_register_all(void);
+
+#endif /* FFMPEG_AVDEVICE_H */
+
Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile (original)
+++ trunk/libavformat/Makefile Thu Nov 22 17:10:02 2007
@@ -31,7 +31,6 @@ OBJS-$(CONFIG_AVI_MUXER)
OBJS-$(CONFIG_AVISYNTH) += avisynth.o
OBJS-$(CONFIG_AVS_DEMUXER) += avs.o vocdec.o voc.o
OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o
-OBJS-$(CONFIG_BKTR_DEMUXER) += bktr.o
OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o
OBJS-$(CONFIG_CRC_MUXER) += crcenc.o
OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o
@@ -39,7 +38,6 @@ OBJS-$(CONFIG_DSICIN_DEMUXER)
OBJS-$(CONFIG_DTS_DEMUXER) += raw.o
OBJS-$(CONFIG_DV_DEMUXER) += dv.o
OBJS-$(CONFIG_DV_MUXER) += dvenc.o
-OBJS-$(CONFIG_DV1394_DEMUXER) += dv1394.o dv.o
OBJS-$(CONFIG_DXA_DEMUXER) += dxa.o riff.o
OBJS-$(CONFIG_EA_CDATA_DEMUXER) += eacdata.o
OBJS-$(CONFIG_EA_DEMUXER) += electronicarts.o
@@ -114,8 +112,6 @@ OBJS-$(CONFIG_OGG_DEMUXER)
oggparseogm.o \
riff.o
OBJS-$(CONFIG_OGG_MUXER) += oggenc.o
-OBJS-$(CONFIG_OSS_DEMUXER) += audio.o
-OBJS-$(CONFIG_OSS_MUXER) += audio.o
OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o
OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += raw.o
OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.o
@@ -141,8 +137,6 @@ OBJS-$(CONFIG_THP_DEMUXER)
OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o
OBJS-$(CONFIG_TTA_DEMUXER) += tta.o
OBJS-$(CONFIG_TXD_DEMUXER) += txd.o
-OBJS-$(CONFIG_V4L2_DEMUXER) += v4l2.o
-OBJS-$(CONFIG_V4L_DEMUXER) += v4l.o
OBJS-$(CONFIG_VC1_DEMUXER) += raw.o
OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.o
OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.o voc.o
@@ -153,12 +147,10 @@ OBJS-$(CONFIG_WC3_DEMUXER)
OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o
OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o
OBJS-$(CONFIG_WV_DEMUXER) += wv.o
-OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER) += x11grab.o
OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o
OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o
# external libraries
-OBJS-$(CONFIG_LIBDC1394_DEMUXER) += libdc1394.o
OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o riff.o
OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o
@@ -167,9 +159,6 @@ OBJS-$(CONFIG_VHOOK)
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
-lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
-CPPOBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o
-CPPOBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o
-
# protocols I/O
OBJS+= avio.o aviobuf.o
Modified: trunk/libavformat/allformats.c
==============================================================================
--- trunk/libavformat/allformats.c (original)
+++ trunk/libavformat/allformats.c Thu Nov 22 17:10:02 2007
@@ -60,19 +60,16 @@ void av_register_all(void)
REGISTER_MUXDEMUX (ASF, asf);
REGISTER_MUXER (ASF_STREAM, asf_stream);
REGISTER_MUXDEMUX (AU, au);
- REGISTER_MUXDEMUX (AUDIO_BEOS, audio_beos);
REGISTER_MUXDEMUX (AVI, avi);
REGISTER_DEMUXER (AVISYNTH, avisynth);
REGISTER_DEMUXER (AVS, avs);
REGISTER_DEMUXER (BETHSOFTVID, bethsoftvid);
- REGISTER_DEMUXER (BKTR, bktr);
REGISTER_DEMUXER (C93, c93);
REGISTER_MUXER (CRC, crc);
REGISTER_DEMUXER (DAUD, daud);
REGISTER_DEMUXER (DSICIN, dsicin);
REGISTER_DEMUXER (DTS, dts);
REGISTER_MUXDEMUX (DV, dv);
- REGISTER_DEMUXER (DV1394, dv1394);
REGISTER_DEMUXER (DXA, dxa);
REGISTER_DEMUXER (EA, ea);
REGISTER_DEMUXER (EA_CDATA, ea_cdata);
@@ -123,7 +120,6 @@ void av_register_all(void)
REGISTER_MUXDEMUX (NUT, nut);
REGISTER_DEMUXER (NUV, nuv);
REGISTER_MUXDEMUX (OGG, ogg);
- REGISTER_MUXDEMUX (OSS, oss);
REGISTER_MUXDEMUX (PCM_ALAW, pcm_alaw);
REGISTER_MUXDEMUX (PCM_MULAW, pcm_mulaw);
REGISTER_MUXDEMUX (PCM_S16BE, pcm_s16be);
@@ -156,8 +152,6 @@ void av_register_all(void)
REGISTER_DEMUXER (TIERTEXSEQ, tiertexseq);
REGISTER_DEMUXER (TTA, tta);
REGISTER_DEMUXER (TXD, txd);
- REGISTER_DEMUXER (V4L2, v4l2);
- REGISTER_DEMUXER (V4L, v4l);
REGISTER_DEMUXER (VC1, vc1);
REGISTER_DEMUXER (VMD, vmd);
REGISTER_MUXDEMUX (VOC, voc);
@@ -166,11 +160,9 @@ void av_register_all(void)
REGISTER_DEMUXER (WSAUD, wsaud);
REGISTER_DEMUXER (WSVQA, wsvqa);
REGISTER_DEMUXER (WV, wv);
- REGISTER_DEMUXER (X11_GRAB_DEVICE, x11_grab_device);
REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe);
/* external libraries */
- REGISTER_DEMUXER (LIBDC1394, libdc1394);
REGISTER_MUXDEMUX (LIBNUT, libnut);
/* protocols */
More information about the ffmpeg-cvslog
mailing list