diff --git a/configure b/configure
index 2554e8fd89..a053556ff1 100755
--- a/configure
+++ b/configure
@@ -826,8 +826,8 @@ done
 ENCODER_LIST=`grep 'register_avcodec(&[a-z0-9_]*_encoder)' "$source_path/libavcodec/allcodecs.c"  | sed 's/.*&\(.*\)).*/\1/'`
 DECODER_LIST=`grep 'register_avcodec(&[a-z0-9_]*_decoder)' "$source_path/libavcodec/allcodecs.c"  | sed 's/.*&\(.*\)).*/\1/'`
 PARSER_LIST=`grep 'av_register_codec_parser(&[a-z]' "$source_path/libavcodec/allcodecs.c"  | sed 's/.*&\(.*\)).*/\1/'`
-MUXER_LIST=`grep 'av_register_output_format(&[a-z]' "$source_path/libavformat/allformats.c"  | sed 's/.*&\(.*\)).*/\1/'`
-DEMUXER_LIST=`grep 'av_register_input_format(&[a-z]' "$source_path/libavformat/allformats.c"  | sed 's/.*&\(.*\)).*/\1/'`
+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"`
 
 enable $ENCODER_LIST $DECODER_LIST $PARSER_LIST $MUXER_LIST $DEMUXER_LIST
 
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 02fa1746c4..f4b16adffd 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -21,6 +21,12 @@
 #include "avformat.h"
 #include "allformats.h"
 
+#define REGISTER_MUXER(X,x) \
+          if(ENABLE_##X##_MUXER)   av_register_output_format(&x##_muxer)
+#define REGISTER_DEMUXER(X,x) \
+          if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer)
+#define REGISTER_MUXDEMUX(X,x)  REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x)
+
 /* If you do not call this function, then you can select exactly which
    formats you want to support */
 
@@ -38,440 +44,129 @@ void av_register_all(void)
     avcodec_init();
     avcodec_register_all();
 
-#ifdef CONFIG_FOURXM_DEMUXER
-    av_register_input_format(&fourxm_demuxer);
-#endif
-#ifdef CONFIG_ADTS_MUXER
-    av_register_output_format(&adts_muxer);
-#endif
-#ifdef CONFIG_AIFF_DEMUXER
-    av_register_input_format(&aiff_demuxer);
-#endif
-#ifdef CONFIG_AIFF_MUXER
-    av_register_output_format(&aiff_muxer);
-#endif
-#ifdef CONFIG_AMR_DEMUXER
-    av_register_input_format(&amr_demuxer);
-#endif
-#ifdef CONFIG_AMR_MUXER
-    av_register_output_format(&amr_muxer);
-#endif
-#ifdef CONFIG_ASF_DEMUXER
-    av_register_input_format(&asf_demuxer);
-#endif
-#ifdef CONFIG_ASF_MUXER
-    av_register_output_format(&asf_muxer);
-#endif
-#ifdef CONFIG_ASF_STREAM_MUXER
-    av_register_output_format(&asf_stream_muxer);
-#endif
-#ifdef CONFIG_AU_DEMUXER
-    av_register_input_format(&au_demuxer);
-#endif
-#ifdef CONFIG_AU_MUXER
-    av_register_output_format(&au_muxer);
-#endif
+    REGISTER_DEMUXER (AAC, aac);
+    REGISTER_MUXDEMUX(AC3, ac3);
+    REGISTER_MUXER   (ADTS, adts);
+    REGISTER_MUXDEMUX(AIFF, aiff);
+    REGISTER_MUXDEMUX(AMR, amr);
+    REGISTER_MUXDEMUX(ASF, asf);
+    REGISTER_MUXER   (ASF_STREAM, asf_stream);
+    REGISTER_MUXDEMUX(AU, au);
 #if defined(CONFIG_AUDIO_OSS) || defined(CONFIG_AUDIO_BEOS)
-#ifdef CONFIG_AUDIO_DEMUXER
-    av_register_input_format(&audio_demuxer);
-#endif
-#ifdef CONFIG_AUDIO_MUXER
-    av_register_output_format(&audio_muxer);
-#endif
-#endif /* CONFIG_AUDIO_OSS || CONFIG_AUDIO_BEOS */
-#ifdef CONFIG_AVI_DEMUXER
-    av_register_input_format(&avi_demuxer);
-#endif
-#ifdef CONFIG_AVI_MUXER
-    av_register_output_format(&avi_muxer);
+    REGISTER_MUXDEMUX(AUDIO, audio);
 #endif
+    REGISTER_MUXDEMUX(AVI, avi);
 #ifdef CONFIG_AVISYNTH
     av_register_input_format(&avisynth_demuxer);
 #endif
-#ifdef CONFIG_AVS_DEMUXER
-    av_register_input_format(&avs_demuxer);
-#endif
-#ifdef CONFIG_CRC_MUXER
-    av_register_output_format(&crc_muxer);
-#endif
-#ifdef CONFIG_FRAMECRC_MUXER
-    av_register_output_format(&framecrc_muxer);
-#endif
-#ifdef CONFIG_DAUD_DEMUXER
-    av_register_input_format(&daud_demuxer);
-#endif
+    REGISTER_DEMUXER (AVS, avs);
+    REGISTER_MUXER   (CRC, crc);
+    REGISTER_DEMUXER (DAUD, daud);
 #ifdef CONFIG_DC1394
-#ifdef CONFIG_DC1394_DEMUXER
-    av_register_input_format(&dc1394_demuxer);
-#endif
-#endif /* CONFIG_DC1394 */
-#ifdef CONFIG_DSICIN_DEMUXER
-    av_register_input_format(&dsicin_demuxer);
+    REGISTER_DEMUXER (DC1394, dc1394);
 #endif
+    REGISTER_DEMUXER (DSICIN, dsicin);
+    REGISTER_DEMUXER (DTS, dts);
+    REGISTER_MUXDEMUX(DV, dv);
 #ifdef CONFIG_DV1394
-#ifdef CONFIG_DV1394_DEMUXER
-    av_register_input_format(&dv1394_demuxer);
-#endif
-#endif /* CONFIG_DV1394 */
-#ifdef CONFIG_DV_DEMUXER
-    av_register_input_format(&dv_demuxer);
-#endif
-#ifdef CONFIG_DV_MUXER
-    av_register_output_format(&dv_muxer);
-#endif
-#ifdef CONFIG_EA_DEMUXER
-    av_register_input_format(&ea_demuxer);
-#endif
-#ifdef CONFIG_FFM_DEMUXER
-    av_register_input_format(&ffm_demuxer);
-#endif
-#ifdef CONFIG_FFM_MUXER
-    av_register_output_format(&ffm_muxer);
-#endif
-#ifdef CONFIG_FLIC_DEMUXER
-    av_register_input_format(&flic_demuxer);
-#endif
-#ifdef CONFIG_FLV_DEMUXER
-    av_register_input_format(&flv_demuxer);
-#endif
-#ifdef CONFIG_FLV_MUXER
-    av_register_output_format(&flv_muxer);
-#endif
-#ifdef CONFIG_GIF_MUXER
-    av_register_output_format(&gif_muxer);
-#endif
-#ifdef CONFIG_GIF_DEMUXER
-    av_register_input_format(&gif_demuxer);
-#endif
-#ifdef CONFIG_GXF_DEMUXER
-    av_register_input_format(&gxf_demuxer);
-#endif
-#if defined(CONFIG_GXF_MUXER) && defined(CONFIG_GPL)
-    av_register_output_format(&gxf_muxer);
-#endif
-#ifdef CONFIG_IDCIN_DEMUXER
-    av_register_input_format(&idcin_demuxer);
-#endif
-#ifdef CONFIG_ROQ_DEMUXER
-    av_register_input_format(&roq_demuxer);
-#endif
-#ifdef CONFIG_IMAGE2_DEMUXER
-    av_register_input_format(&image2_demuxer);
-#endif
-#ifdef CONFIG_IMAGE2PIPE_DEMUXER
-    av_register_input_format(&image2pipe_demuxer);
-#endif
-#ifdef CONFIG_IMAGE2_MUXER
-    av_register_output_format(&image2_muxer);
-#endif
-#ifdef CONFIG_IMAGE2PIPE_MUXER
-    av_register_output_format(&image2pipe_muxer);
-#endif
-#ifdef CONFIG_IPMOVIE_DEMUXER
-    av_register_input_format(&ipmovie_demuxer);
-#endif
-#ifdef CONFIG_MATROSKA_DEMUXER
-    av_register_input_format(&matroska_demuxer);
-#endif
-#ifdef CONFIG_MM_DEMUXER
-    av_register_input_format(&mm_demuxer);
-#endif
-#ifdef CONFIG_MMF_DEMUXER
-    av_register_input_format(&mmf_demuxer);
-#endif
-#ifdef CONFIG_MMF_MUXER
-    av_register_output_format(&mmf_muxer);
-#endif
-#ifdef CONFIG_MOV_DEMUXER
-    av_register_input_format(&mov_demuxer);
-#endif
-#ifdef CONFIG_MOV_MUXER
-    av_register_output_format(&mov_muxer);
-#endif
-#ifdef CONFIG_MTV_DEMUXER
-    av_register_input_format(&mtv_demuxer);
-#endif
-#ifdef CONFIG_TGP_MUXER
-    av_register_output_format(&tgp_muxer);
-#endif
-#ifdef CONFIG_MP4_MUXER
-    av_register_output_format(&mp4_muxer);
-#endif
-#ifdef CONFIG_PSP_MUXER
-    av_register_output_format(&psp_muxer);
-#endif
-#ifdef CONFIG_TG2_MUXER
-    av_register_output_format(&tg2_muxer);
-#endif
-#ifdef CONFIG_MP3_DEMUXER
-    av_register_input_format(&mp3_demuxer);
-#endif
-#ifdef CONFIG_MP2_MUXER
-    av_register_output_format(&mp2_muxer);
-#endif
-#ifdef CONFIG_MP3_MUXER
-    av_register_output_format(&mp3_muxer);
-#endif
-#ifdef CONFIG_MPEG1SYSTEM_MUXER
-    av_register_output_format(&mpeg1system_muxer);
-#endif
-#ifdef CONFIG_MPEG1VCD_MUXER
-    av_register_output_format(&mpeg1vcd_muxer);
-#endif
-#ifdef CONFIG_MPEG2VOB_MUXER
-    av_register_output_format(&mpeg2vob_muxer);
-#endif
-#ifdef CONFIG_MPEG2SVCD_MUXER
-    av_register_output_format(&mpeg2svcd_muxer);
-#endif
-#ifdef CONFIG_MPEG2DVD_MUXER
-    av_register_output_format(&mpeg2dvd_muxer);
-#endif
-#ifdef CONFIG_MPEGPS_DEMUXER
-    av_register_input_format(&mpegps_demuxer);
-#endif
-#ifdef CONFIG_MPEGTS_DEMUXER
-    av_register_input_format(&mpegts_demuxer);
-#endif
-#ifdef CONFIG_MPEGTS_MUXER
-    av_register_output_format(&mpegts_muxer);
-#endif
-#ifdef CONFIG_MPJPEG_MUXER
-    av_register_output_format(&mpjpeg_muxer);
-#endif
-#ifdef CONFIG_MXF_DEMUXER
-    av_register_input_format(&mxf_demuxer);
-#endif
-#ifdef CONFIG_NSV_DEMUXER
-    av_register_input_format(&nsv_demuxer);
-#endif
-#ifdef CONFIG_NUT_DEMUXER
-    av_register_input_format(&nut_demuxer);
-#endif
-#ifdef CONFIG_NUT_MUXER
+    REGISTER_DEMUXER (DV1394, dv1394);
+#endif
+    REGISTER_DEMUXER (EA, ea);
+    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_DEMUXER (GXF, gxf);
+#ifdef CONFIG_GPL
+    REGISTER_MUXER   (GXF, gxf);
+#endif
+    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_DEMUXER (MATROSKA, matroska);
+    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_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 (MPEGVIDEO, mpegvideo);
+    REGISTER_MUXER   (MPJPEG, mpjpeg);
+    REGISTER_DEMUXER (MTV, mtv);
+    REGISTER_DEMUXER (MXF, mxf);
+    REGISTER_DEMUXER (NSV, nsv);
+    REGISTER_MUXER   (NULL, null);
+    REGISTER_DEMUXER (NUT, nut);
 #ifdef CONFIG_LIBNUT
-    av_register_output_format(&nut_muxer);
-#endif
-#endif
-#ifdef CONFIG_NUV_DEMUXER
-    av_register_input_format(&nuv_demuxer);
-#endif
-#ifdef CONFIG_OGG_DEMUXER
-    av_register_input_format(&ogg_demuxer);
+    REGISTER_MUXER   (NUT, nut);
 #endif
+    REGISTER_DEMUXER (NUV, nuv);
+    REGISTER_DEMUXER (OGG, ogg);
 #ifdef CONFIG_LIBOGG
-#ifdef CONFIG_OGG_MUXER
-    av_register_output_format(&ogg_muxer);
-#endif
-#endif /* CONFIG_LIBOGG */
-#ifdef CONFIG_STR_DEMUXER
-    av_register_input_format(&str_demuxer);
-#endif
-#ifdef CONFIG_SHORTEN_DEMUXER
-    av_register_input_format(&shorten_demuxer);
-#endif
-#ifdef CONFIG_FLAC_DEMUXER
-    av_register_input_format(&flac_demuxer);
-#endif
-#ifdef CONFIG_FLAC_MUXER
-    av_register_output_format(&flac_muxer);
-#endif
-#ifdef CONFIG_AC3_DEMUXER
-    av_register_input_format(&ac3_demuxer);
-#endif
-#ifdef CONFIG_AC3_MUXER
-    av_register_output_format(&ac3_muxer);
-#endif
-#ifdef CONFIG_DTS_DEMUXER
-    av_register_input_format(&dts_demuxer);
-#endif
-#ifdef CONFIG_AAC_DEMUXER
-    av_register_input_format(&aac_demuxer);
-#endif
-#ifdef CONFIG_H261_DEMUXER
-    av_register_input_format(&h261_demuxer);
-#endif
-#ifdef CONFIG_H261_MUXER
-    av_register_output_format(&h261_muxer);
-#endif
-#ifdef CONFIG_H263_DEMUXER
-    av_register_input_format(&h263_demuxer);
-#endif
-#ifdef CONFIG_H263_MUXER
-    av_register_output_format(&h263_muxer);
-#endif
-#ifdef CONFIG_M4V_DEMUXER
-    av_register_input_format(&m4v_demuxer);
-#endif
-#ifdef CONFIG_M4V_MUXER
-    av_register_output_format(&m4v_muxer);
-#endif
-#ifdef CONFIG_H264_DEMUXER
-    av_register_input_format(&h264_demuxer);
-#endif
-#ifdef CONFIG_H264_MUXER
-    av_register_output_format(&h264_muxer);
-#endif
-#ifdef CONFIG_MPEGVIDEO_DEMUXER
-    av_register_input_format(&mpegvideo_demuxer);
-#endif
-#ifdef CONFIG_MPEG1VIDEO_MUXER
-    av_register_output_format(&mpeg1video_muxer);
-#endif
-#ifdef CONFIG_MPEG2VIDEO_MUXER
-    av_register_output_format(&mpeg2video_muxer);
-#endif
-#ifdef CONFIG_MJPEG_DEMUXER
-    av_register_input_format(&mjpeg_demuxer);
-#endif
-#ifdef CONFIG_INGENIENT_DEMUXER
-    av_register_input_format(&ingenient_demuxer);
-#endif
-#ifdef CONFIG_MJPEG_MUXER
-    av_register_output_format(&mjpeg_muxer);
-#endif
-#ifdef CONFIG_PCM_S16LE_DEMUXER
-    av_register_input_format(&pcm_s16le_demuxer);
-#endif
-#ifdef CONFIG_PCM_S16LE_MUXER
-    av_register_output_format(&pcm_s16le_muxer);
-#endif
-#ifdef CONFIG_PCM_S16BE_DEMUXER
-    av_register_input_format(&pcm_s16be_demuxer);
-#endif
-#ifdef CONFIG_PCM_S16BE_MUXER
-    av_register_output_format(&pcm_s16be_muxer);
-#endif
-#ifdef CONFIG_PCM_U16LE_DEMUXER
-    av_register_input_format(&pcm_u16le_demuxer);
-#endif
-#ifdef CONFIG_PCM_U16LE_MUXER
-    av_register_output_format(&pcm_u16le_muxer);
-#endif
-#ifdef CONFIG_PCM_U16BE_DEMUXER
-    av_register_input_format(&pcm_u16be_demuxer);
-#endif
-#ifdef CONFIG_PCM_U16BE_MUXER
-    av_register_output_format(&pcm_u16be_muxer);
-#endif
-#ifdef CONFIG_PCM_S8_DEMUXER
-    av_register_input_format(&pcm_s8_demuxer);
-#endif
-#ifdef CONFIG_PCM_S8_MUXER
-    av_register_output_format(&pcm_s8_muxer);
-#endif
-#ifdef CONFIG_PCM_U8_DEMUXER
-    av_register_input_format(&pcm_u8_demuxer);
-#endif
-#ifdef CONFIG_PCM_U8_MUXER
-    av_register_output_format(&pcm_u8_muxer);
-#endif
-#ifdef CONFIG_PCM_MULAW_DEMUXER
-    av_register_input_format(&pcm_mulaw_demuxer);
-#endif
-#ifdef CONFIG_PCM_MULAW_MUXER
-    av_register_output_format(&pcm_mulaw_muxer);
-#endif
-#ifdef CONFIG_PCM_ALAW_DEMUXER
-    av_register_input_format(&pcm_alaw_demuxer);
-#endif
-#ifdef CONFIG_PCM_ALAW_MUXER
-    av_register_output_format(&pcm_alaw_muxer);
-#endif
-#ifdef CONFIG_RAWVIDEO_DEMUXER
-    av_register_input_format(&rawvideo_demuxer);
-#endif
-#ifdef CONFIG_RAWVIDEO_MUXER
-    av_register_output_format(&rawvideo_muxer);
-#endif
-#ifdef CONFIG_NULL_MUXER
-    av_register_output_format(&null_muxer);
-#endif
-#ifdef CONFIG_RM_DEMUXER
-    av_register_input_format(&rm_demuxer);
-#endif
-#ifdef CONFIG_RM_MUXER
-    av_register_output_format(&rm_muxer);
-#endif
+    REGISTER_MUXER   (OGG, ogg);
+#endif
+    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_DEMUXER (ROQ, roq);
 #ifdef CONFIG_NETWORK
-#ifdef CONFIG_RTP_MUXER
-    av_register_output_format(&rtp_muxer);
-#endif
-#ifdef CONFIG_RTSP_DEMUXER
-    av_register_input_format(&rtsp_demuxer);
-#endif
-#ifdef CONFIG_SDP_DEMUXER
-    av_register_input_format(&sdp_demuxer);
-#endif
-#ifdef CONFIG_REDIR_DEMUXER
-    av_register_input_format(&redir_demuxer);
-#endif
+    REGISTER_DEMUXER (REDIR, redir);
+    REGISTER_MUXER   (RTP, rtp);
+    REGISTER_DEMUXER (RTSP, rtsp);
+    REGISTER_DEMUXER (SDP, sdp);
     av_register_rtp_dynamic_payload_handlers();
-#endif /* CONFIG_NETWORK */
-#ifdef CONFIG_SEGAFILM_DEMUXER
-    av_register_input_format(&segafilm_demuxer);
-#endif
-#ifdef CONFIG_VMD_DEMUXER
-    av_register_input_format(&vmd_demuxer);
-#endif
-#ifdef CONFIG_SMACKER_DEMUXER
-    av_register_input_format(&smacker_demuxer);
-#endif
-#ifdef CONFIG_SOL_DEMUXER
-    av_register_input_format(&sol_demuxer);
-#endif
-#ifdef CONFIG_SWF_DEMUXER
-    av_register_input_format(&swf_demuxer);
-#endif
-#ifdef CONFIG_SWF_MUXER
-    av_register_output_format(&swf_muxer);
-#endif
-#ifdef CONFIG_TTA_DEMUXER
-    av_register_input_format(&tta_demuxer);
 #endif
+    REGISTER_DEMUXER (SEGAFILM, segafilm);
+    REGISTER_DEMUXER (SHORTEN, shorten);
+    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 (TIERTEXSEQ, tiertexseq);
+    REGISTER_DEMUXER (TTA, tta);
 #ifdef CONFIG_VIDEO4LINUX2
-#ifdef CONFIG_V4L2_DEMUXER
-    av_register_input_format(&v4l2_demuxer);
+    REGISTER_DEMUXER (V4L2, v4l2);
 #endif
-#endif /* CONFIG_VIDEO4LINUX2 */
 #if defined(CONFIG_VIDEO4LINUX) || defined(CONFIG_BKTR)
-#ifdef CONFIG_VIDEO_GRAB_DEVICE_DEMUXER
-    av_register_input_format(&video_grab_device_demuxer);
-#endif
-#endif /* CONFIG_VIDEO4LINUX || CONFIG_BKTR */
-#ifdef CONFIG_VOC_DEMUXER
-    av_register_input_format(&voc_demuxer);
-#endif
-#ifdef CONFIG_VOC_MUXER
-    av_register_output_format(&voc_muxer);
-#endif
-#ifdef CONFIG_WAV_DEMUXER
-    av_register_input_format(&wav_demuxer);
-#endif
-#ifdef CONFIG_WAV_MUXER
-    av_register_output_format(&wav_muxer);
-#endif
-#ifdef CONFIG_WC3_DEMUXER
-    av_register_input_format(&wc3_demuxer);
-#endif
-#ifdef CONFIG_WSAUD_DEMUXER
-    av_register_input_format(&wsaud_demuxer);
-#endif
-#ifdef CONFIG_WSVQA_DEMUXER
-    av_register_input_format(&wsvqa_demuxer);
-#endif
-#ifdef CONFIG_WV_DEMUXER
-    av_register_input_format(&wv_demuxer);
-#endif
-#ifdef CONFIG_YUV4MPEGPIPE_MUXER
-    av_register_output_format(&yuv4mpegpipe_muxer);
-#endif
-#ifdef CONFIG_YUV4MPEGPIPE_DEMUXER
-    av_register_input_format(&yuv4mpegpipe_demuxer);
-#endif
-#ifdef CONFIG_TIERTEXSEQ_DEMUXER
-    av_register_input_format(&tiertexseq_demuxer);
-#endif
+    REGISTER_DEMUXER (VIDEO_GRAB_DEVICE, video_grab_device);
+#endif
+    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_MUXDEMUX(YUV4MPEGPIPE, yuv4mpegpipe);
 
 #ifdef CONFIG_PROTOCOLS
     /* file protocols */