[FFmpeg-cvslog] r11080 - in trunk: configure libavdevice/alldevices.c
lucabe
subversion
Fri Nov 23 09:07:23 CET 2007
Author: lucabe
Date: Fri Nov 23 09:07:23 2007
New Revision: 11080
Log:
Fix the creation of alldevices.c (create it without any rename).
This also requires some changes to configure
Added:
trunk/configure
- copied, changed from r11069, /trunk/configure
trunk/libavdevice/alldevices.c
- copied, changed from r11004, /trunk/libavformat/allformats.c
Copied: trunk/configure (from r11069, /trunk/configure)
==============================================================================
--- /trunk/configure (original)
+++ trunk/configure Fri Nov 23 09:07:23 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"`
+OUTDEV_LIST=`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' "$source_path/libavdevice/alldevices.c"`
+INDEV_LIST=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/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"
Copied: trunk/libavdevice/alldevices.c (from r11004, /trunk/libavformat/allformats.c)
==============================================================================
--- /trunk/libavformat/allformats.c (original)
+++ trunk/libavdevice/alldevices.c Fri Nov 23 09:07:23 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,7 +18,7 @@
* 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) { \
extern AVOutputFormat x##_muxer; \
@@ -28,17 +27,8 @@
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 */
-/**
- * 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);
+ /* devices */
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);
/* 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);
}
More information about the ffmpeg-cvslog
mailing list