]> git.sesse.net Git - ffmpeg/blobdiff - libavcodec/allcodecs.c
Remove cs_test and swscale-example on clean.
[ffmpeg] / libavcodec / allcodecs.c
index 9cddeb6d72f9fdba3d974784f62997ed1626ae3c..fdd80fc07cc49542a7f24d6a13f66842d0e77fc9 100644 (file)
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
    formats you want to support */
 
 /**
- * simple call to register all the codecs. 
+ * simple call to register all the codecs.
  */
 void avcodec_register_all(void)
 {
     static int inited = 0;
-    
+
     if (inited != 0)
-       return;
+        return;
     inited = 1;
 
     /* encoders */
-#ifdef CONFIG_ENCODERS
 #ifdef CONFIG_AC3_ENCODER
     register_avcodec(&ac3_encoder);
 #endif //CONFIG_AC3_ENCODER
@@ -52,26 +51,21 @@ void avcodec_register_all(void)
 #endif //CONFIG_MP3LAME_ENCODER
 #endif
 #ifdef CONFIG_LIBVORBIS
-#ifdef CONFIG_OGGVORBIS_ENCODER
+#if (defined CONFIG_OGGVORBIS_ENCODER && !defined CONFIG_VORBIS_ENCODER)
     register_avcodec(&oggvorbis_encoder);
 #endif //CONFIG_OGGVORBIS_ENCODER
-#ifdef CONFIG_OGGVORBIS_DECODER
+#if (defined CONFIG_OGGVORBIS_DECODER && !defined CONFIG_VORBIS_DECODER)
     register_avcodec(&oggvorbis_decoder);
 #endif //CONFIG_OGGVORBIS_DECODER
 #endif
-#ifdef CONFIG_LIBTHEORA
-#ifdef CONFIG_OGGTHEORA_ENCODER
-    register_avcodec(&oggtheora_encoder);
-#endif //CONFIG_OGGTHEORA_ENCODER
-#ifdef CONFIG_OGGTHEORA_DECODER
-    register_avcodec(&oggtheora_decoder);
-#endif //CONFIG_OGGTHEORA_DECODER
-#endif
 #ifdef CONFIG_FAAC
 #ifdef CONFIG_FAAC_ENCODER
     register_avcodec(&faac_encoder);
 #endif //CONFIG_FAAC_ENCODER
 #endif
+#ifdef CONFIG_FLAC_ENCODER
+    register_avcodec(&flac_encoder);
+#endif
 #ifdef CONFIG_XVID
 #ifdef CONFIG_XVID_ENCODER
     register_avcodec(&xvid_encoder);
@@ -131,6 +125,9 @@ void avcodec_register_all(void)
 #ifdef CONFIG_LJPEG_ENCODER
     register_avcodec(&ljpeg_encoder);
 #endif //CONFIG_LJPEG_ENCODER
+#ifdef CONFIG_JPEGLS_ENCODER
+    register_avcodec(&jpegls_encoder);
+#endif //CONFIG_JPEGLS_ENCODER
 #ifdef CONFIG_ZLIB
 #ifdef CONFIG_PNG_ENCODER
     register_avcodec(&png_encoder);
@@ -186,16 +183,14 @@ void avcodec_register_all(void)
     register_avcodec(&x264_encoder);
 #endif //CONFIG_X264_ENCODER
 #endif
-#endif /* CONFIG_ENCODERS */
+#ifdef CONFIG_LIBGSM
+    register_avcodec(&libgsm_encoder);
+#endif //CONFIG_LIBGSM
 #ifdef CONFIG_RAWVIDEO_ENCODER
     register_avcodec(&rawvideo_encoder);
 #endif //CONFIG_RAWVIDEO_ENCODER
-#ifdef CONFIG_RAWVIDEO_DECODER
-    register_avcodec(&rawvideo_decoder);
-#endif //CONFIG_RAWVIDEO_DECODER
 
     /* decoders */
-#ifdef CONFIG_DECODERS
 #ifdef CONFIG_H263_DECODER
     register_avcodec(&h263_decoder);
 #endif //CONFIG_H263_DECODER
@@ -220,9 +215,9 @@ void avcodec_register_all(void)
 #ifdef CONFIG_WMV2_DECODER
     register_avcodec(&wmv2_decoder);
 #endif //CONFIG_WMV2_DECODER
-#ifdef CONFIG_VC9_DECODER
-    register_avcodec(&vc9_decoder);
-#endif //CONFIG_VC9_DECODER
+#ifdef CONFIG_VC1_DECODER
+    register_avcodec(&vc1_decoder);
+#endif //CONFIG_VC1_DECODER
 #ifdef CONFIG_WMV3_DECODER
     register_avcodec(&wmv3_decoder);
 #endif //CONFIG_WMV3_DECODER
@@ -259,6 +254,12 @@ void avcodec_register_all(void)
 #ifdef CONFIG_TSCC_DECODER
     register_avcodec(&tscc_decoder);
 #endif //CONFIG_TSCC_DECODER
+#ifdef CONFIG_CSCD_DECODER
+    register_avcodec(&cscd_decoder);
+#endif //CONFIG_CSCD_DECODER
+#ifdef CONFIG_NUV_DECODER
+    register_avcodec(&nuv_decoder);
+#endif //CONFIG_NUV_DECODER
 #ifdef CONFIG_ULTI_DECODER
     register_avcodec(&ulti_decoder);
 #endif //CONFIG_ULTI_DECODER
@@ -274,12 +275,18 @@ void avcodec_register_all(void)
 #ifdef CONFIG_LOCO_DECODER
     register_avcodec(&loco_decoder);
 #endif //CONFIG_LOCO_DECODER
+#ifdef CONFIG_KMVC_DECODER
+    register_avcodec(&kmvc_decoder);
+#endif //CONFIG_KMVC_DECODER
 #ifdef CONFIG_WNV1_DECODER
     register_avcodec(&wnv1_decoder);
 #endif //CONFIG_WNV1_DECODER
 #ifdef CONFIG_AASC_DECODER
     register_avcodec(&aasc_decoder);
 #endif //CONFIG_AASC_DECODER
+#ifdef CONFIG_FRAPS_DECODER
+    register_avcodec(&fraps_decoder);
+#endif //CONFIG_FRAPS_DECODER
 #ifdef CONFIG_FAAD
 #ifdef CONFIG_AAC_DECODER
     register_avcodec(&aac_decoder);
@@ -361,6 +368,15 @@ void avcodec_register_all(void)
 #ifdef CONFIG_THEORA_DECODER
     register_avcodec(&theora_decoder);
 #endif //CONFIG_THEORA_DECODER
+#ifdef CONFIG_VP5_DECODER
+    register_avcodec(&vp5_decoder);
+#endif //CONFIG_VP5_DECODER
+#ifdef CONFIG_VP6_DECODER
+    register_avcodec(&vp6_decoder);
+#endif //CONFIG_VP6_DECODER
+#ifdef CONFIG_VP6F_DECODER
+    register_avcodec(&vp6f_decoder);
+#endif //CONFIG_VP6F_DECODER
 #ifdef CONFIG_ASV1_DECODER
     register_avcodec(&asv1_decoder);
 #endif //CONFIG_ASV1_DECODER
@@ -418,6 +434,9 @@ void avcodec_register_all(void)
 #ifdef CONFIG_TRUEMOTION1_DECODER
     register_avcodec(&truemotion1_decoder);
 #endif //CONFIG_TRUEMOTION1_DECODER
+#ifdef CONFIG_TRUEMOTION2_DECODER
+    register_avcodec(&truemotion2_decoder);
+#endif //CONFIG_TRUEMOTION2_DECODER
 #ifdef CONFIG_VMDVIDEO_DECODER
     register_avcodec(&vmdvideo_decoder);
 #endif //CONFIG_VMDVIDEO_DECODER
@@ -430,6 +449,15 @@ void avcodec_register_all(void)
 #ifdef CONFIG_ZLIB_DECODER
     register_avcodec(&zlib_decoder);
 #endif //CONFIG_ZLIB_DECODER
+#ifdef CONFIG_ZMBV_DECODER
+    register_avcodec(&zmbv_decoder);
+#endif //CONFIG_ZMBV_DECODER
+#ifdef CONFIG_SMACKER_DECODER
+    register_avcodec(&smacker_decoder);
+#endif //CONFIG_SMACKER_DECODER
+#ifdef CONFIG_SMACKAUD_DECODER
+    register_avcodec(&smackaud_decoder);
+#endif //CONFIG_SMACKAUD_DECODER
 #ifdef CONFIG_SONIC_DECODER
     register_avcodec(&sonic_decoder);
 #endif //CONFIG_SONIC_DECODER
@@ -476,85 +504,344 @@ void avcodec_register_all(void)
 #ifdef CONFIG_WS_SND1_DECODER
     register_avcodec(&ws_snd1_decoder);
 #endif //CONFIG_WS_SND1_DECODER
-#endif /* CONFIG_DECODERS */
+#ifdef CONFIG_VORBIS_DECODER
+    register_avcodec(&vorbis_decoder);
+#endif
+#ifdef CONFIG_VORBIS_ENCODER
+    register_avcodec(&vorbis_encoder);
+#endif
+#ifdef CONFIG_LIBGSM
+    register_avcodec(&libgsm_decoder);
+#endif //CONFIG_LIBGSM
+#ifdef CONFIG_QDM2_DECODER
+    register_avcodec(&qdm2_decoder);
+#endif //CONFIG_QDM2_DECODER
+#ifdef CONFIG_COOK_DECODER
+    register_avcodec(&cook_decoder);
+#endif //CONFIG_COOK_DECODER
+#ifdef CONFIG_TRUESPEECH_DECODER
+    register_avcodec(&truespeech_decoder);
+#endif //CONFIG_TRUESPEECH_DECODER
+#ifdef CONFIG_TTA_DECODER
+    register_avcodec(&tta_decoder);
+#endif //CONFIG_TTA_DECODER
+#ifdef CONFIG_AVS_DECODER
+    register_avcodec(&avs_decoder);
+#endif //CONFIG_AVS_DECODER
+#ifdef CONFIG_CAVS_DECODER
+    register_avcodec(&cavs_decoder);
+#endif //CONFIG_CAVS_DECODER
+#ifdef CONFIG_RAWVIDEO_DECODER
+    register_avcodec(&rawvideo_decoder);
+#endif //CONFIG_RAWVIDEO_DECODER
+#ifdef CONFIG_FLASHSV_DECODER
+    register_avcodec(&flashsv_decoder);
+#endif //CONFIG_FLASHSV_DECODER
+#ifdef CONFIG_VMNC_DECODER
+    register_avcodec(&vmnc_decoder);
+#endif //CONFIG_VMNC_DECODER
+#ifdef CONFIG_WAVPACK_DECODER
+    register_avcodec(&wavpack_decoder);
+#endif //CONFIG_WAVPACK_DECODER
 
-#ifdef AMR_NB
+#if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)
 #ifdef CONFIG_AMR_NB_DECODER
     register_avcodec(&amr_nb_decoder);
 #endif //CONFIG_AMR_NB_DECODER
-#ifdef CONFIG_ENCODERS
 #ifdef CONFIG_AMR_NB_ENCODER
     register_avcodec(&amr_nb_encoder);
 #endif //CONFIG_AMR_NB_ENCODER
-#endif //CONFIG_ENCODERS
-#endif /* AMR_NB */
+#endif /* CONFIG_AMR_NB || CONFIG_AMR_NB_FIXED */
 
-#ifdef AMR_WB
+#ifdef CONFIG_AMR_WB
 #ifdef CONFIG_AMR_WB_DECODER
     register_avcodec(&amr_wb_decoder);
 #endif //CONFIG_AMR_WB_DECODER
-#ifdef CONFIG_ENCODERS
 #ifdef CONFIG_AMR_WB_ENCODER
     register_avcodec(&amr_wb_encoder);
 #endif //CONFIG_AMR_WB_ENCODER
-#endif //CONFIG_ENCODERS
-#endif /* AMR_WB */
+#endif /* CONFIG_AMR_WB */
 
-    /* pcm codecs */
+#ifdef CONFIG_BMP_DECODER
+    register_avcodec(&bmp_decoder);
+#endif
 
-#ifdef CONFIG_ENCODERS
-#define PCM_CODEC(id, name) \
-    register_avcodec(& name ## _encoder); \
-    register_avcodec(& name ## _decoder); \
+#if CONFIG_MMVIDEO_DECODER
+    register_avcodec(&mmvideo_decoder);
+#endif //CONFIG_MMVIDEO_DECODER
 
-#else
-#define PCM_CODEC(id, name) \
-    register_avcodec(& name ## _decoder);
+    /* pcm codecs */
+#ifdef CONFIG_PCM_S32LE_DECODER
+    register_avcodec(&pcm_s32le_decoder);
+#endif
+#ifdef CONFIG_PCM_S32LE_ENCODER
+    register_avcodec(&pcm_s32le_encoder);
+#endif
+#ifdef CONFIG_PCM_S32BE_DECODER
+    register_avcodec(&pcm_s32be_decoder);
+#endif
+#ifdef CONFIG_PCM_S32BE_ENCODER
+    register_avcodec(&pcm_s32be_encoder);
+#endif
+#ifdef CONFIG_PCM_U32LE_DECODER
+    register_avcodec(&pcm_u32le_decoder);
+#endif
+#ifdef CONFIG_PCM_U32LE_ENCODER
+    register_avcodec(&pcm_u32le_encoder);
+#endif
+#ifdef CONFIG_PCM_U32BE_DECODER
+    register_avcodec(&pcm_u32be_decoder);
+#endif
+#ifdef CONFIG_PCM_U32BE_ENCODER
+    register_avcodec(&pcm_u32be_encoder);
+#endif
+#ifdef CONFIG_PCM_S24LE_DECODER
+    register_avcodec(&pcm_s24le_decoder);
+#endif
+#ifdef CONFIG_PCM_S24LE_ENCODER
+    register_avcodec(&pcm_s24le_encoder);
+#endif
+#ifdef CONFIG_PCM_S24BE_DECODER
+    register_avcodec(&pcm_s24be_decoder);
+#endif
+#ifdef CONFIG_PCM_S24BE_ENCODER
+    register_avcodec(&pcm_s24be_encoder);
+#endif
+#ifdef CONFIG_PCM_U24LE_DECODER
+    register_avcodec(&pcm_u24le_decoder);
+#endif
+#ifdef CONFIG_PCM_U24LE_ENCODER
+    register_avcodec(&pcm_u24le_encoder);
+#endif
+#ifdef CONFIG_PCM_U24BE_DECODER
+    register_avcodec(&pcm_u24be_decoder);
+#endif
+#ifdef CONFIG_PCM_U24BE_ENCODER
+    register_avcodec(&pcm_u24be_encoder);
+#endif
+#ifdef CONFIG_PCM_S24DAUD_DECODER
+    register_avcodec(&pcm_s24daud_decoder);
+#endif
+#ifdef CONFIG_PCM_S24DAUD_ENCODER
+    register_avcodec(&pcm_s24daud_encoder);
+#endif
+#ifdef CONFIG_PCM_S16LE_DECODER
+    register_avcodec(&pcm_s16le_decoder);
+#endif
+#ifdef CONFIG_PCM_S16LE_ENCODER
+    register_avcodec(&pcm_s16le_encoder);
+#endif
+#ifdef CONFIG_PCM_S16BE_DECODER
+    register_avcodec(&pcm_s16be_decoder);
+#endif
+#ifdef CONFIG_PCM_S16BE_ENCODER
+    register_avcodec(&pcm_s16be_encoder);
+#endif
+#ifdef CONFIG_PCM_U16LE_DECODER
+    register_avcodec(&pcm_u16le_decoder);
+#endif
+#ifdef CONFIG_PCM_U16LE_ENCODER
+    register_avcodec(&pcm_u16le_encoder);
+#endif
+#ifdef CONFIG_PCM_U16BE_DECODER
+    register_avcodec(&pcm_u16be_decoder);
+#endif
+#ifdef CONFIG_PCM_U16BE_ENCODER
+    register_avcodec(&pcm_u16be_encoder);
+#endif
+#ifdef CONFIG_PCM_S8_DECODER
+    register_avcodec(&pcm_s8_decoder);
+#endif
+#ifdef CONFIG_PCM_S8_ENCODER
+    register_avcodec(&pcm_s8_encoder);
+#endif
+#ifdef CONFIG_PCM_U8_DECODER
+    register_avcodec(&pcm_u8_decoder);
+#endif
+#ifdef CONFIG_PCM_U8_ENCODER
+    register_avcodec(&pcm_u8_encoder);
+#endif
+#ifdef CONFIG_PCM_ALAW_DECODER
+    register_avcodec(&pcm_alaw_decoder);
+#endif
+#ifdef CONFIG_PCM_ALAW_ENCODER
+    register_avcodec(&pcm_alaw_encoder);
+#endif
+#ifdef CONFIG_PCM_MULAW_DECODER
+    register_avcodec(&pcm_mulaw_decoder);
+#endif
+#ifdef CONFIG_PCM_MULAW_ENCODER
+    register_avcodec(&pcm_mulaw_encoder);
 #endif
 
-PCM_CODEC(CODEC_ID_PCM_S16LE, pcm_s16le);
-PCM_CODEC(CODEC_ID_PCM_S16BE, pcm_s16be);
-PCM_CODEC(CODEC_ID_PCM_U16LE, pcm_u16le);
-PCM_CODEC(CODEC_ID_PCM_U16BE, pcm_u16be);
-PCM_CODEC(CODEC_ID_PCM_S8, pcm_s8);
-PCM_CODEC(CODEC_ID_PCM_U8, pcm_u8);
-PCM_CODEC(CODEC_ID_PCM_ALAW, pcm_alaw);
-PCM_CODEC(CODEC_ID_PCM_MULAW, pcm_mulaw);
+   /* adpcm codecs */
+#ifdef CONFIG_ADPCM_IMA_QT_DECODER
+    register_avcodec(&adpcm_ima_qt_decoder);
+#endif
+#ifdef CONFIG_ADPCM_IMA_QT_ENCODER
+    register_avcodec(&adpcm_ima_qt_encoder);
+#endif
+#ifdef CONFIG_ADPCM_IMA_WAV_DECODER
+    register_avcodec(&adpcm_ima_wav_decoder);
+#endif
+#ifdef CONFIG_ADPCM_IMA_WAV_ENCODER
+    register_avcodec(&adpcm_ima_wav_encoder);
+#endif
+#ifdef CONFIG_ADPCM_IMA_DK3_DECODER
+    register_avcodec(&adpcm_ima_dk3_decoder);
+#endif
+#ifdef CONFIG_ADPCM_IMA_DK3_ENCODER
+    register_avcodec(&adpcm_ima_dk3_encoder);
+#endif
+#ifdef CONFIG_ADPCM_IMA_DK4_DECODER
+    register_avcodec(&adpcm_ima_dk4_decoder);
+#endif
+#ifdef CONFIG_ADPCM_IMA_DK4_ENCODER
+    register_avcodec(&adpcm_ima_dk4_encoder);
+#endif
+#ifdef CONFIG_ADPCM_IMA_WS_DECODER
+    register_avcodec(&adpcm_ima_ws_decoder);
+#endif
+#ifdef CONFIG_ADPCM_IMA_WS_ENCODER
+    register_avcodec(&adpcm_ima_ws_encoder);
+#endif
+#ifdef CONFIG_ADPCM_IMA_SMJPEG_DECODER
+    register_avcodec(&adpcm_ima_smjpeg_decoder);
+#endif
+#ifdef CONFIG_ADPCM_IMA_SMJPEG_ENCODER
+    register_avcodec(&adpcm_ima_smjpeg_encoder);
+#endif
+#ifdef CONFIG_ADPCM_MS_DECODER
+    register_avcodec(&adpcm_ms_decoder);
+#endif
+#ifdef CONFIG_ADPCM_MS_ENCODER
+    register_avcodec(&adpcm_ms_encoder);
+#endif
+#ifdef CONFIG_ADPCM_4XM_DECODER
+    register_avcodec(&adpcm_4xm_decoder);
+#endif
+#ifdef CONFIG_ADPCM_4XM_ENCODER
+    register_avcodec(&adpcm_4xm_encoder);
+#endif
+#ifdef CONFIG_ADPCM_XA_DECODER
+    register_avcodec(&adpcm_xa_decoder);
+#endif
+#ifdef CONFIG_ADPCM_XA_ENCODER
+    register_avcodec(&adpcm_xa_encoder);
+#endif
+#ifdef CONFIG_ADPCM_ADX_DECODER
+    register_avcodec(&adpcm_adx_decoder);
+#endif
+#ifdef CONFIG_ADPCM_ADX_ENCODER
+    register_avcodec(&adpcm_adx_encoder);
+#endif
+#ifdef CONFIG_ADPCM_EA_DECODER
+    register_avcodec(&adpcm_ea_decoder);
+#endif
+#ifdef CONFIG_ADPCM_EA_ENCODER
+    register_avcodec(&adpcm_ea_encoder);
+#endif
+#ifdef CONFIG_ADPCM_G726_DECODER
+    register_avcodec(&adpcm_g726_decoder);
+#endif
+#ifdef CONFIG_ADPCM_G726_ENCODER
+    register_avcodec(&adpcm_g726_encoder);
+#endif
+#ifdef CONFIG_ADPCM_CT_DECODER
+    register_avcodec(&adpcm_ct_decoder);
+#endif
+#ifdef CONFIG_ADPCM_CT_ENCODER
+    register_avcodec(&adpcm_ct_encoder);
+#endif
+#ifdef CONFIG_ADPCM_SWF_DECODER
+    register_avcodec(&adpcm_swf_decoder);
+#endif
+#ifdef CONFIG_ADPCM_SWF_ENCODER
+    register_avcodec(&adpcm_swf_encoder);
+#endif
+#ifdef CONFIG_ADPCM_YAMAHA_DECODER
+    register_avcodec(&adpcm_yamaha_decoder);
+#endif
+#ifdef CONFIG_ADPCM_YAMAHA_ENCODER
+    register_avcodec(&adpcm_yamaha_encoder);
+#endif
+#ifdef CONFIG_ADPCM_SBPRO_4_DECODER
+    register_avcodec(&adpcm_sbpro_4_decoder);
+#endif
+#ifdef CONFIG_ADPCM_SBPRO_4_ENCODER
+    register_avcodec(&adpcm_sbpro_4_encoder);
+#endif
+#ifdef CONFIG_ADPCM_SBPRO_3_DECODER
+    register_avcodec(&adpcm_sbpro_3_decoder);
+#endif
+#ifdef CONFIG_ADPCM_SBPRO_3_ENCODER
+    register_avcodec(&adpcm_sbpro_3_encoder);
+#endif
+#ifdef CONFIG_ADPCM_SBPRO_2_DECODER
+    register_avcodec(&adpcm_sbpro_2_decoder);
+#endif
+#ifdef CONFIG_ADPCM_SBPRO_2_ENCODER
+    register_avcodec(&adpcm_sbpro_2_encoder);
+#endif
 
-    /* adpcm codecs */
-PCM_CODEC(CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt);
-PCM_CODEC(CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav);
-PCM_CODEC(CODEC_ID_ADPCM_IMA_DK3, adpcm_ima_dk3);
-PCM_CODEC(CODEC_ID_ADPCM_IMA_DK4, adpcm_ima_dk4);
-PCM_CODEC(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws);
-PCM_CODEC(CODEC_ID_ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg);
-PCM_CODEC(CODEC_ID_ADPCM_MS, adpcm_ms);
-PCM_CODEC(CODEC_ID_ADPCM_4XM, adpcm_4xm);
-PCM_CODEC(CODEC_ID_ADPCM_XA, adpcm_xa);
-PCM_CODEC(CODEC_ID_ADPCM_ADX, adpcm_adx);
-PCM_CODEC(CODEC_ID_ADPCM_EA, adpcm_ea);
-PCM_CODEC(CODEC_ID_ADPCM_G726, adpcm_g726);
-PCM_CODEC(CODEC_ID_ADPCM_CT, adpcm_ct);
-PCM_CODEC(CODEC_ID_ADPCM_SWF, adpcm_swf);
+    /* subtitles */
+#ifdef CONFIG_DVDSUB_DECODER
+    register_avcodec(&dvdsub_decoder);
+#endif
+#ifdef CONFIG_DVDSUB_ENCODER
+    register_avcodec(&dvdsub_encoder);
+#endif
 
-#undef PCM_CODEC
+#ifdef CONFIG_DVBSUB_DECODER
+    register_avcodec(&dvbsub_decoder);
+#endif
+#ifdef CONFIG_DVBSUB_ENCODER
+    register_avcodec(&dvbsub_encoder);
+#endif
 
-    /* parsers */ 
+    /* parsers */
+#ifdef CONFIG_MPEGVIDEO_PARSER
     av_register_codec_parser(&mpegvideo_parser);
+#endif
+#ifdef CONFIG_MPEG4VIDEO_PARSER
     av_register_codec_parser(&mpeg4video_parser);
-#if defined(CONFIG_H261_DECODER) || defined(CONFIG_H261_ENCODER)
+#endif
+#ifdef CONFIG_CAVSVIDEO_PARSER
+    av_register_codec_parser(&cavsvideo_parser);
+#endif
+#ifdef CONFIG_H261_PARSER
     av_register_codec_parser(&h261_parser);
 #endif
+#ifdef CONFIG_H263_PARSER
     av_register_codec_parser(&h263_parser);
-#ifdef CONFIG_H264_DECODER
+#endif
+#ifdef CONFIG_H264_PARSER
     av_register_codec_parser(&h264_parser);
 #endif
+#ifdef CONFIG_MJPEG_PARSER
     av_register_codec_parser(&mjpeg_parser);
+#endif
+#ifdef CONFIG_PNM_PARSER
     av_register_codec_parser(&pnm_parser);
-
+#endif
+#ifdef CONFIG_MPEGAUDIO_PARSER
     av_register_codec_parser(&mpegaudio_parser);
-#ifdef CONFIG_AC3
+#endif
+#ifdef CONFIG_AC3_PARSER
     av_register_codec_parser(&ac3_parser);
 #endif
+#ifdef CONFIG_DVDSUB_PARSER
+    av_register_codec_parser(&dvdsub_parser);
+#endif
+#ifdef CONFIG_DVBSUB_PARSER
+    av_register_codec_parser(&dvbsub_parser);
+#endif
+#ifdef CONFIG_AAC_PARSER
+    av_register_codec_parser(&aac_parser);
+#endif
+
+    av_register_bitstream_filter(&dump_extradata_bsf);
+    av_register_bitstream_filter(&remove_extradata_bsf);
+    av_register_bitstream_filter(&noise_bsf);
 }