virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

remove no longer needed #ifdefs

Browse Source 
Originally committed as revision 7617 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2007-01-21 21:04:01 +00:00
parent 30fd06bea9
commit eba70fa4e2
2 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/allcodecs.c
View File

@ -65,9 +65,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(EIGHTBPS, eightbps); REGISTER_DECODER(EIGHTBPS, eightbps);
REGISTER_ENCDEC (FFV1, ffv1); REGISTER_ENCDEC (FFV1, ffv1);
REGISTER_ENCDEC (FFVHUFF, ffvhuff); REGISTER_ENCDEC (FFVHUFF, ffvhuff);
#ifdef CONFIG_ZLIB
REGISTER_ENCDEC (FLASHSV, flashsv); REGISTER_ENCDEC (FLASHSV, flashsv);
#endif
REGISTER_DECODER(FLIC, flic); REGISTER_DECODER(FLIC, flic);
REGISTER_ENCDEC (FLV, flv); REGISTER_ENCDEC (FLV, flv);
REGISTER_DECODER(FOURXM, fourxm); REGISTER_DECODER(FOURXM, fourxm);
@ -91,9 +89,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (MJPEG, mjpeg); REGISTER_ENCDEC (MJPEG, mjpeg);
REGISTER_DECODER(MJPEGB, mjpegb); REGISTER_DECODER(MJPEGB, mjpegb);
REGISTER_DECODER(MMVIDEO, mmvideo); REGISTER_DECODER(MMVIDEO, mmvideo);
#ifdef HAVE_XVMC
REGISTER_DECODER(MPEG_XVMC, mpeg_xvmc); REGISTER_DECODER(MPEG_XVMC, mpeg_xvmc);
#endif
REGISTER_ENCDEC (MPEG1VIDEO, mpeg1video); REGISTER_ENCDEC (MPEG1VIDEO, mpeg1video);
REGISTER_ENCDEC (MPEG2VIDEO, mpeg2video); REGISTER_ENCDEC (MPEG2VIDEO, mpeg2video);
REGISTER_ENCDEC (MPEG4, mpeg4); REGISTER_ENCDEC (MPEG4, mpeg4);
@ -109,9 +105,7 @@ void avcodec_register_all(void)
REGISTER_ENCODER(PBM, pbm); REGISTER_ENCODER(PBM, pbm);
REGISTER_ENCODER(PGM, pgm); REGISTER_ENCODER(PGM, pgm);
REGISTER_ENCODER(PGMYUV, pgmyuv); REGISTER_ENCODER(PGMYUV, pgmyuv);
#ifdef CONFIG_ZLIB
REGISTER_ENCDEC (PNG, png); REGISTER_ENCDEC (PNG, png);
#endif
REGISTER_ENCODER(PPM, ppm); REGISTER_ENCODER(PPM, ppm);
REGISTER_DECODER(QDRAW, qdraw); REGISTER_DECODER(QDRAW, qdraw);
REGISTER_DECODER(QPEG, qpeg); REGISTER_DECODER(QPEG, qpeg);
@ -148,56 +142,34 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (WMV2, wmv2); REGISTER_ENCDEC (WMV2, wmv2);
REGISTER_DECODER(WMV3, wmv3); REGISTER_DECODER(WMV3, wmv3);
REGISTER_DECODER(WNV1, wnv1); REGISTER_DECODER(WNV1, wnv1);
#ifdef CONFIG_X264
REGISTER_ENCODER(X264, x264); REGISTER_ENCODER(X264, x264);
#endif
REGISTER_DECODER(XAN_WC3, xan_wc3); REGISTER_DECODER(XAN_WC3, xan_wc3);
REGISTER_DECODER(XL, xl); REGISTER_DECODER(XL, xl);
#ifdef CONFIG_XVID
REGISTER_ENCODER(XVID, xvid); REGISTER_ENCODER(XVID, xvid);
#endif
REGISTER_ENCDEC (ZLIB, zlib); REGISTER_ENCDEC (ZLIB, zlib);
#ifdef CONFIG_ZLIB
REGISTER_ENCDEC (ZMBV, zmbv); REGISTER_ENCDEC (ZMBV, zmbv);
#endif
/* audio codecs */ /* audio codecs */
#ifdef CONFIG_LIBFAAD
REGISTER_DECODER(AAC, aac); REGISTER_DECODER(AAC, aac);
REGISTER_DECODER(MPEG4AAC, mpeg4aac); REGISTER_DECODER(MPEG4AAC, mpeg4aac);
#endif
#ifdef CONFIG_LIBA52
REGISTER_DECODER(AC3, ac3); REGISTER_DECODER(AC3, ac3);
#endif
REGISTER_ENCODER(AC3, ac3); REGISTER_ENCODER(AC3, ac3);
REGISTER_DECODER(ALAC, alac); REGISTER_DECODER(ALAC, alac);
#if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)
REGISTER_ENCDEC (AMR_NB, amr_nb); REGISTER_ENCDEC (AMR_NB, amr_nb);
#endif
#ifdef CONFIG_AMR_WB
REGISTER_ENCDEC (AMR_WB, amr_wb); REGISTER_ENCDEC (AMR_WB, amr_wb);
#endif
REGISTER_DECODER(COOK, cook); REGISTER_DECODER(COOK, cook);
REGISTER_DECODER(DSICINAUDIO, dsicinaudio); REGISTER_DECODER(DSICINAUDIO, dsicinaudio);
#ifdef CONFIG_LIBDTS
REGISTER_DECODER(DTS, dts); REGISTER_DECODER(DTS, dts);
#endif
#ifdef CONFIG_LIBFAAC
REGISTER_ENCODER(FAAC, faac); REGISTER_ENCODER(FAAC, faac);
#endif
REGISTER_ENCDEC (FLAC, flac); REGISTER_ENCDEC (FLAC, flac);
REGISTER_DECODER(IMC, imc); REGISTER_DECODER(IMC, imc);
#ifdef CONFIG_LIBGSM
REGISTER_ENCDEC (LIBGSM, libgsm); REGISTER_ENCDEC (LIBGSM, libgsm);
#endif
REGISTER_DECODER(MACE3, mace3); REGISTER_DECODER(MACE3, mace3);
REGISTER_DECODER(MACE6, mace6); REGISTER_DECODER(MACE6, mace6);
REGISTER_ENCDEC (MP2, mp2); REGISTER_ENCDEC (MP2, mp2);
REGISTER_DECODER(MP3, mp3); REGISTER_DECODER(MP3, mp3);
REGISTER_DECODER(MP3ADU, mp3adu); REGISTER_DECODER(MP3ADU, mp3adu);
#ifdef CONFIG_LIBMP3LAME
REGISTER_ENCODER(MP3LAME, mp3lame); REGISTER_ENCODER(MP3LAME, mp3lame);
#endif
REGISTER_DECODER(MP3ON4, mp3on4); REGISTER_DECODER(MP3ON4, mp3on4);
REGISTER_DECODER(MPC7, mpc7); REGISTER_DECODER(MPC7, mpc7);
#ifdef CONFIG_LIBVORBIS #ifdef CONFIG_LIBVORBIS

20
libavformat/allformats.c
View File

@ -52,9 +52,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX(ASF, asf); REGISTER_MUXDEMUX(ASF, asf);
REGISTER_MUXER (ASF_STREAM, asf_stream); REGISTER_MUXER (ASF_STREAM, asf_stream);
REGISTER_MUXDEMUX(AU, au); REGISTER_MUXDEMUX(AU, au);
#if defined(CONFIG_AUDIO_OSS) || defined(CONFIG_AUDIO_BEOS)
REGISTER_MUXDEMUX(AUDIO, audio); REGISTER_MUXDEMUX(AUDIO, audio);
#endif
REGISTER_MUXDEMUX(AVI, avi); REGISTER_MUXDEMUX(AVI, avi);
#ifdef CONFIG_AVISYNTH #ifdef CONFIG_AVISYNTH
av_register_input_format(&avisynth_demuxer); av_register_input_format(&avisynth_demuxer);
@ -62,15 +60,11 @@ void av_register_all(void)
REGISTER_DEMUXER (AVS, avs); REGISTER_DEMUXER (AVS, avs);
REGISTER_MUXER (CRC, crc); REGISTER_MUXER (CRC, crc);
REGISTER_DEMUXER (DAUD, daud); REGISTER_DEMUXER (DAUD, daud);
#ifdef CONFIG_DC1394
REGISTER_DEMUXER (DC1394, dc1394); REGISTER_DEMUXER (DC1394, dc1394);
#endif
REGISTER_DEMUXER (DSICIN, dsicin); REGISTER_DEMUXER (DSICIN, dsicin);
REGISTER_DEMUXER (DTS, dts); REGISTER_DEMUXER (DTS, dts);
REGISTER_MUXDEMUX(DV, dv); REGISTER_MUXDEMUX(DV, dv);
#ifdef CONFIG_DV1394
REGISTER_DEMUXER (DV1394, dv1394); REGISTER_DEMUXER (DV1394, dv1394);
#endif
REGISTER_DEMUXER (EA, ea); REGISTER_DEMUXER (EA, ea);
REGISTER_MUXDEMUX(FFM, ffm); REGISTER_MUXDEMUX(FFM, ffm);
REGISTER_MUXDEMUX(FLAC, flac); REGISTER_MUXDEMUX(FLAC, flac);
@ -80,9 +74,7 @@ void av_register_all(void)
REGISTER_MUXER (FRAMECRC, framecrc); REGISTER_MUXER (FRAMECRC, framecrc);
REGISTER_MUXDEMUX(GIF, gif); REGISTER_MUXDEMUX(GIF, gif);
REGISTER_DEMUXER (GXF, gxf); REGISTER_DEMUXER (GXF, gxf);
#ifdef CONFIG_GPL
REGISTER_MUXER (GXF, gxf); REGISTER_MUXER (GXF, gxf);
#endif
REGISTER_MUXDEMUX(H261, h261); REGISTER_MUXDEMUX(H261, h261);
REGISTER_MUXDEMUX(H263, h263); REGISTER_MUXDEMUX(H263, h263);
REGISTER_MUXDEMUX(H264, h264); REGISTER_MUXDEMUX(H264, h264);
@ -117,14 +109,10 @@ void av_register_all(void)
REGISTER_DEMUXER (NSV, nsv); REGISTER_DEMUXER (NSV, nsv);
REGISTER_MUXER (NULL, null); REGISTER_MUXER (NULL, null);
REGISTER_DEMUXER (NUT, nut); REGISTER_DEMUXER (NUT, nut);
#ifdef CONFIG_LIBNUT
REGISTER_MUXER (NUT, nut); REGISTER_MUXER (NUT, nut);
#endif
REGISTER_DEMUXER (NUV, nuv); REGISTER_DEMUXER (NUV, nuv);
REGISTER_DEMUXER (OGG, ogg); REGISTER_DEMUXER (OGG, ogg);
#ifdef CONFIG_LIBOGG
REGISTER_MUXER (OGG, ogg); REGISTER_MUXER (OGG, ogg);
#endif
REGISTER_MUXDEMUX(PCM_ALAW, pcm_alaw); REGISTER_MUXDEMUX(PCM_ALAW, pcm_alaw);
REGISTER_MUXDEMUX(PCM_MULAW, pcm_mulaw); REGISTER_MUXDEMUX(PCM_MULAW, pcm_mulaw);
REGISTER_MUXDEMUX(PCM_S16BE, pcm_s16be); REGISTER_MUXDEMUX(PCM_S16BE, pcm_s16be);
@ -137,11 +125,11 @@ void av_register_all(void)
REGISTER_MUXDEMUX(RAWVIDEO, rawvideo); REGISTER_MUXDEMUX(RAWVIDEO, rawvideo);
REGISTER_MUXDEMUX(RM, rm); REGISTER_MUXDEMUX(RM, rm);
REGISTER_DEMUXER (ROQ, roq); REGISTER_DEMUXER (ROQ, roq);
#ifdef CONFIG_NETWORK
REGISTER_DEMUXER (REDIR, redir); REGISTER_DEMUXER (REDIR, redir);
REGISTER_MUXER (RTP, rtp); REGISTER_MUXER (RTP, rtp);
REGISTER_DEMUXER (RTSP, rtsp); REGISTER_DEMUXER (RTSP, rtsp);
REGISTER_DEMUXER (SDP, sdp); REGISTER_DEMUXER (SDP, sdp);
#ifdef CONFIG_NETWORK
av_register_rtp_dynamic_payload_handlers(); av_register_rtp_dynamic_payload_handlers();
#endif #endif
REGISTER_DEMUXER (SEGAFILM, segafilm); REGISTER_DEMUXER (SEGAFILM, segafilm);
@ -154,12 +142,8 @@ void av_register_all(void)
REGISTER_MUXER (TGP, tgp); REGISTER_MUXER (TGP, tgp);
REGISTER_DEMUXER (TIERTEXSEQ, tiertexseq); REGISTER_DEMUXER (TIERTEXSEQ, tiertexseq);
REGISTER_DEMUXER (TTA, tta); REGISTER_DEMUXER (TTA, tta);
#ifdef CONFIG_VIDEO4LINUX2
REGISTER_DEMUXER (V4L2, v4l2); REGISTER_DEMUXER (V4L2, v4l2);
#endif
#if defined(CONFIG_VIDEO4LINUX) || defined(CONFIG_BKTR)
REGISTER_DEMUXER (VIDEO_GRAB_DEVICE, video_grab_device); REGISTER_DEMUXER (VIDEO_GRAB_DEVICE, video_grab_device);
#endif
REGISTER_DEMUXER (VMD, vmd); REGISTER_DEMUXER (VMD, vmd);
REGISTER_MUXDEMUX(VOC, voc); REGISTER_MUXDEMUX(VOC, voc);
REGISTER_MUXDEMUX(WAV, wav); REGISTER_MUXDEMUX(WAV, wav);
@ -167,9 +151,7 @@ void av_register_all(void)
REGISTER_DEMUXER (WSAUD, wsaud); REGISTER_DEMUXER (WSAUD, wsaud);
REGISTER_DEMUXER (WSVQA, wsvqa); REGISTER_DEMUXER (WSVQA, wsvqa);
REGISTER_DEMUXER (WV, wv); REGISTER_DEMUXER (WV, wv);
#ifdef CONFIG_X11GRAB
REGISTER_DEMUXER (X11_GRAB_DEVICE, x11_grab_device); REGISTER_DEMUXER (X11_GRAB_DEVICE, x11_grab_device);
#endif
REGISTER_MUXDEMUX(YUV4MPEGPIPE, yuv4mpegpipe); REGISTER_MUXDEMUX(YUV4MPEGPIPE, yuv4mpegpipe);
#ifdef CONFIG_PROTOCOLS #ifdef CONFIG_PROTOCOLS