X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fallformats.c;h=0dfaa93b6c0031679efdb4d1e098a6f9d47e3927;hb=119c61a30faf564216524f953e4f1582fa800409;hp=fbddc5b895e0bbb805bdd074aedbb8821a760ca6;hpb=b64c096be96686d4bf6ef4b50be60dc212f11d49;p=ffmpeg diff --git a/libavformat/allformats.c b/libavformat/allformats.c index fbddc5b895e..0dfaa93b6c0 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -19,25 +19,23 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" -#include "rtp_internal.h" +#include "rtp.h" +#include "rdt.h" #define REGISTER_MUXER(X,x) { \ - extern AVOutputFormat x##_muxer; \ - if(ENABLE_##X##_MUXER) av_register_output_format(&x##_muxer); } + extern AVOutputFormat x##_muxer; \ + if(CONFIG_##X##_MUXER) av_register_output_format(&x##_muxer); } + #define REGISTER_DEMUXER(X,x) { \ - extern AVInputFormat x##_demuxer; \ - if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer); } + extern AVInputFormat x##_demuxer; \ + if(CONFIG_##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_PROTOCOL(X,x) { \ + extern URLProtocol x##_protocol; \ + if(CONFIG_##X##_PROTOCOL) av_register_protocol(&x##_protocol); } -/** - * Initialize libavformat and register all the (de)muxers and protocols. - */ void av_register_all(void) { static int initialized; @@ -46,18 +44,19 @@ void av_register_all(void) return; initialized = 1; - avcodec_init(); avcodec_register_all(); /* (de)muxers */ REGISTER_DEMUXER (AAC, aac); REGISTER_MUXDEMUX (AC3, ac3); REGISTER_MUXER (ADTS, adts); + REGISTER_DEMUXER (AEA, aea); REGISTER_MUXDEMUX (AIFF, aiff); REGISTER_MUXDEMUX (AMR, amr); REGISTER_DEMUXER (APC, apc); REGISTER_DEMUXER (APE, ape); REGISTER_MUXDEMUX (ASF, asf); + REGISTER_MUXDEMUX (ASS, ass); REGISTER_MUXER (ASF_STREAM, asf_stream); REGISTER_MUXDEMUX (AU, au); REGISTER_MUXDEMUX (AVI, avi); @@ -67,21 +66,27 @@ void av_register_all(void) REGISTER_DEMUXER (BETHSOFTVID, bethsoftvid); REGISTER_DEMUXER (BFI, bfi); REGISTER_DEMUXER (C93, c93); + REGISTER_DEMUXER (CAF, caf); + REGISTER_DEMUXER (CAVSVIDEO, cavsvideo); REGISTER_MUXER (CRC, crc); - REGISTER_DEMUXER (DAUD, daud); + REGISTER_MUXDEMUX (DAUD, daud); + REGISTER_MUXDEMUX (DIRAC, dirac); + REGISTER_MUXDEMUX (DNXHD, dnxhd); REGISTER_DEMUXER (DSICIN, dsicin); - REGISTER_DEMUXER (DTS, dts); + REGISTER_MUXDEMUX (DTS, dts); REGISTER_MUXDEMUX (DV, dv); REGISTER_DEMUXER (DXA, dxa); REGISTER_DEMUXER (EA, ea); REGISTER_DEMUXER (EA_CDATA, ea_cdata); + REGISTER_MUXDEMUX (EAC3, eac3); 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_MUXER (GIF, gif); + REGISTER_DEMUXER (GSM, gsm); REGISTER_MUXDEMUX (GXF, gxf); REGISTER_MUXDEMUX (H261, h261); REGISTER_MUXDEMUX (H263, h263); @@ -93,11 +98,14 @@ void av_register_all(void) REGISTER_DEMUXER (INGENIENT, ingenient); REGISTER_DEMUXER (IPMOVIE, ipmovie); REGISTER_MUXER (IPOD, ipod); + REGISTER_DEMUXER (ISS, iss); + REGISTER_DEMUXER (IV8, iv8); REGISTER_DEMUXER (LMLM4, lmlm4); REGISTER_MUXDEMUX (M4V, m4v); REGISTER_MUXDEMUX (MATROSKA, matroska); REGISTER_MUXER (MATROSKA_AUDIO, matroska_audio); REGISTER_MUXDEMUX (MJPEG, mjpeg); + REGISTER_MUXDEMUX (MLP, mlp); REGISTER_DEMUXER (MM, mm); REGISTER_MUXDEMUX (MMF, mmf); REGISTER_MUXDEMUX (MOV, mov); @@ -120,24 +128,41 @@ void av_register_all(void) REGISTER_MUXER (MPJPEG, mpjpeg); REGISTER_DEMUXER (MSNWC_TCP, msnwc_tcp); REGISTER_DEMUXER (MTV, mtv); - REGISTER_DEMUXER (MXF, mxf); + REGISTER_DEMUXER (MVI, mvi); + REGISTER_MUXDEMUX (MXF, mxf); + REGISTER_MUXER (MXF_D10, mxf_d10); + REGISTER_DEMUXER (NC, nc); REGISTER_DEMUXER (NSV, nsv); REGISTER_MUXER (NULL, null); REGISTER_MUXDEMUX (NUT, nut); REGISTER_DEMUXER (NUV, nuv); REGISTER_MUXDEMUX (OGG, ogg); + REGISTER_DEMUXER (OMA, oma); REGISTER_MUXDEMUX (PCM_ALAW, pcm_alaw); REGISTER_MUXDEMUX (PCM_MULAW, pcm_mulaw); + REGISTER_MUXDEMUX (PCM_F64BE, pcm_f64be); + REGISTER_MUXDEMUX (PCM_F64LE, pcm_f64le); + REGISTER_MUXDEMUX (PCM_F32BE, pcm_f32be); + REGISTER_MUXDEMUX (PCM_F32LE, pcm_f32le); + REGISTER_MUXDEMUX (PCM_S32BE, pcm_s32be); + REGISTER_MUXDEMUX (PCM_S32LE, pcm_s32le); + REGISTER_MUXDEMUX (PCM_S24BE, pcm_s24be); + REGISTER_MUXDEMUX (PCM_S24LE, pcm_s24le); REGISTER_MUXDEMUX (PCM_S16BE, pcm_s16be); REGISTER_MUXDEMUX (PCM_S16LE, pcm_s16le); REGISTER_MUXDEMUX (PCM_S8, pcm_s8); + REGISTER_MUXDEMUX (PCM_U32BE, pcm_u32be); + REGISTER_MUXDEMUX (PCM_U32LE, pcm_u32le); + REGISTER_MUXDEMUX (PCM_U24BE, pcm_u24be); + REGISTER_MUXDEMUX (PCM_U24LE, pcm_u24le); REGISTER_MUXDEMUX (PCM_U16BE, pcm_u16be); REGISTER_MUXDEMUX (PCM_U16LE, pcm_u16le); REGISTER_MUXDEMUX (PCM_U8, pcm_u8); REGISTER_MUXER (PSP, psp); REGISTER_DEMUXER (PVA, pva); + REGISTER_DEMUXER (QCP, qcp); + REGISTER_DEMUXER (R3D, r3d); REGISTER_MUXDEMUX (RAWVIDEO, rawvideo); - REGISTER_DEMUXER (REDIR, redir); REGISTER_DEMUXER (RL2, rl2); REGISTER_MUXDEMUX (RM, rm); REGISTER_MUXDEMUX (ROQ, roq); @@ -145,31 +170,39 @@ void av_register_all(void) REGISTER_MUXER (RTP, rtp); REGISTER_DEMUXER (RTSP, rtsp); REGISTER_DEMUXER (SDP, sdp); -#ifdef CONFIG_SDP_DEMUXER +#if CONFIG_SDP_DEMUXER av_register_rtp_dynamic_payload_handlers(); + av_register_rdt_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_MUXDEMUX (SOX, sox); + REGISTER_MUXER (SPDIF, spdif); 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 (TMV, tmv); + REGISTER_MUXDEMUX (TRUEHD, truehd); REGISTER_DEMUXER (TTA, tta); REGISTER_DEMUXER (TXD, txd); REGISTER_DEMUXER (VC1, vc1); - REGISTER_DEMUXER (VC1T, vc1t); + REGISTER_MUXDEMUX (VC1T, vc1t); REGISTER_DEMUXER (VMD, vmd); REGISTER_MUXDEMUX (VOC, voc); + REGISTER_DEMUXER (VQF, vqf); + REGISTER_DEMUXER (W64, w64); REGISTER_MUXDEMUX (WAV, wav); REGISTER_DEMUXER (WC3, wc3); REGISTER_DEMUXER (WSAUD, wsaud); REGISTER_DEMUXER (WSVQA, wsvqa); REGISTER_DEMUXER (WV, wv); + REGISTER_DEMUXER (XA, xa); REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe); /* external libraries */ @@ -177,8 +210,10 @@ void av_register_all(void) /* protocols */ REGISTER_PROTOCOL (FILE, file); + REGISTER_PROTOCOL (GOPHER, gopher); REGISTER_PROTOCOL (HTTP, http); REGISTER_PROTOCOL (PIPE, pipe); + REGISTER_PROTOCOL (RTMP, rtmp); REGISTER_PROTOCOL (RTP, rtp); REGISTER_PROTOCOL (TCP, tcp); REGISTER_PROTOCOL (UDP, udp);