Browse code

cleanup the #ifdef mess in encoder/decoder/parser registration

Originally committed as revision 7182 to svn://svn.ffmpeg.org/ffmpeg/trunk

Aurelien Jacobs authored on 2006/11/29 08:55:24
Showing 2 changed files
... ...
@@ -823,9 +823,9 @@ for opt do
823 823
   FFMPEG_CONFIGURATION="$FFMPEG_CONFIGURATION""$opt "
824 824
 done
825 825
 
826
-ENCODER_LIST=`grep 'register_avcodec(&[a-z0-9_]*_encoder)' "$source_path/libavcodec/allcodecs.c"  | sed 's/.*&\(.*\)).*/\1/'`
827
-DECODER_LIST=`grep 'register_avcodec(&[a-z0-9_]*_decoder)' "$source_path/libavcodec/allcodecs.c"  | sed 's/.*&\(.*\)).*/\1/'`
828
-PARSER_LIST=`grep 'av_register_codec_parser(&[a-z]' "$source_path/libavcodec/allcodecs.c"  | sed 's/.*&\(.*\)).*/\1/'`
826
+ENCODER_LIST=`sed -n 's/^[^#]*ENC.*, *\(.*\)).*/\1_encoder/p' "$source_path/libavcodec/allcodecs.c"`
827
+DECODER_LIST=`sed -n 's/^[^#]*DEC.*, *\(.*\)).*/\1_decoder/p' "$source_path/libavcodec/allcodecs.c"`
828
+PARSER_LIST=`sed -n 's/^[^#]*PARSER.*, *\(.*\)).*/\1_parser/p' "$source_path/libavcodec/allcodecs.c"`
829 829
 MUXER_LIST=`sed -n 's/^[^#]*_MUX.*, *\(.*\)).*/\1_muxer/p' "$source_path/libavformat/allformats.c"`
830 830
 DEMUXER_LIST=`sed -n 's/^[^#]*DEMUX.*, *\(.*\)).*/\1_demuxer/p' "$source_path/libavformat/allformats.c"`
831 831
 
... ...
@@ -26,6 +26,15 @@
26 26
 
27 27
 #include "avcodec.h"
28 28
 
29
+#define REGISTER_ENCODER(X,x) \
30
+          if(ENABLE_##X##_ENCODER)  register_avcodec(&x##_encoder)
31
+#define REGISTER_DECODER(X,x) \
32
+          if(ENABLE_##X##_DECODER)  register_avcodec(&x##_decoder)
33
+#define REGISTER_ENCDEC(X,x)  REGISTER_ENCODER(X,x); REGISTER_DECODER(X,x)
34
+
35
+#define REGISTER_PARSER(X,x) \
36
+          if(ENABLE_##X##_PARSER)  av_register_codec_parser(&x##_parser)
37
+
29 38
 /* If you do not call this function, then you can select exactly which
30 39
    formats you want to support */
31 40
 
... ...
@@ -40,830 +49,235 @@ void avcodec_register_all(void)
40 40
         return;
41 41
     inited = 1;
42 42
 
43
-    /* encoders */
44
-#ifdef CONFIG_AC3_ENCODER
45
-    register_avcodec(&ac3_encoder);
46
-#endif //CONFIG_AC3_ENCODER
47
-#if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)
48
-#ifdef CONFIG_AMR_NB_ENCODER
49
-    register_avcodec(&amr_nb_encoder);
50
-#endif //CONFIG_AMR_NB_ENCODER
51
-#endif /* CONFIG_AMR_NB || CONFIG_AMR_NB_FIXED */
52
-#ifdef CONFIG_AMR_WB
53
-#ifdef CONFIG_AMR_WB_ENCODER
54
-    register_avcodec(&amr_wb_encoder);
55
-#endif //CONFIG_AMR_WB_ENCODER
56
-#endif /* CONFIG_AMR_WB */
57
-#ifdef CONFIG_ASV1_ENCODER
58
-    register_avcodec(&asv1_encoder);
59
-#endif //CONFIG_ASV1_ENCODER
60
-#ifdef CONFIG_ASV2_ENCODER
61
-    register_avcodec(&asv2_encoder);
62
-#endif //CONFIG_ASV2_ENCODER
63
-#ifdef CONFIG_DVVIDEO_ENCODER
64
-    register_avcodec(&dvvideo_encoder);
65
-#endif //CONFIG_DVVIDEO_ENCODER
66
-#ifdef CONFIG_FAAC
67
-#ifdef CONFIG_FAAC_ENCODER
68
-    register_avcodec(&faac_encoder);
69
-#endif //CONFIG_FAAC_ENCODER
70
-#endif
71
-#ifdef CONFIG_FFV1_ENCODER
72
-    register_avcodec(&ffv1_encoder);
73
-#endif //CONFIG_FFV1_ENCODER
74
-#ifdef CONFIG_FFVHUFF_ENCODER
75
-    register_avcodec(&ffvhuff_encoder);
76
-#endif //CONFIG_FFVHUFF_ENCODER
77
-#ifdef CONFIG_FLAC_ENCODER
78
-    register_avcodec(&flac_encoder);
79
-#endif
80
-#ifdef CONFIG_FLV_ENCODER
81
-    register_avcodec(&flv_encoder);
82
-#endif //CONFIG_FLV_ENCODER
83
-#ifdef CONFIG_GIF_ENCODER
84
-    register_avcodec(&gif_encoder);
85
-#endif
86
-#ifdef CONFIG_H261_ENCODER
87
-    register_avcodec(&h261_encoder);
88
-#endif //CONFIG_H261_ENCODER
89
-#ifdef CONFIG_H263_ENCODER
90
-    register_avcodec(&h263_encoder);
91
-#endif //CONFIG_H263_ENCODER
92
-#ifdef CONFIG_H263P_ENCODER
93
-    register_avcodec(&h263p_encoder);
94
-#endif //CONFIG_H263P_ENCODER
95
-#ifdef CONFIG_H264_ENCODER
96
-//    register_avcodec(&h264_encoder);
97
-#endif //CONFIG_H264_ENCODER
98
-#ifdef CONFIG_HUFFYUV_ENCODER
99
-    register_avcodec(&huffyuv_encoder);
100
-#endif //CONFIG_HUFFYUV_ENCODER
101
-#ifdef CONFIG_JPEGLS_ENCODER
102
-    register_avcodec(&jpegls_encoder);
103
-#endif //CONFIG_JPEGLS_ENCODER
104
-#ifdef CONFIG_LIBGSM
105
-    register_avcodec(&libgsm_encoder);
106
-#endif //CONFIG_LIBGSM
107
-#ifdef CONFIG_LJPEG_ENCODER
108
-    register_avcodec(&ljpeg_encoder);
109
-#endif //CONFIG_LJPEG_ENCODER
110
-#ifdef CONFIG_MJPEG_ENCODER
111
-    register_avcodec(&mjpeg_encoder);
112
-#endif //CONFIG_MJPEG_ENCODER
113
-#ifdef CONFIG_MP2_ENCODER
114
-    register_avcodec(&mp2_encoder);
115
-#endif //CONFIG_MP2_ENCODER
116
-#ifdef CONFIG_MP3LAME
117
-#ifdef CONFIG_MP3LAME_ENCODER
118
-    register_avcodec(&mp3lame_encoder);
119
-#endif //CONFIG_MP3LAME_ENCODER
120
-#endif
121
-#ifdef CONFIG_MPEG1VIDEO_ENCODER
122
-    register_avcodec(&mpeg1video_encoder);
123
-#endif //CONFIG_MPEG1VIDEO_ENCODER
124
-#ifdef CONFIG_MPEG2VIDEO_ENCODER
125
-    register_avcodec(&mpeg2video_encoder);
126
-#endif //CONFIG_MPEG2VIDEO_ENCODER
127
-#ifdef CONFIG_MPEG4_ENCODER
128
-    register_avcodec(&mpeg4_encoder);
129
-#endif //CONFIG_MPEG4_ENCODER
130
-#ifdef CONFIG_MSMPEG4V1_ENCODER
131
-    register_avcodec(&msmpeg4v1_encoder);
132
-#endif //CONFIG_MSMPEG4V1_ENCODER
133
-#ifdef CONFIG_MSMPEG4V2_ENCODER
134
-    register_avcodec(&msmpeg4v2_encoder);
135
-#endif //CONFIG_MSMPEG4V2_ENCODER
136
-#ifdef CONFIG_MSMPEG4V3_ENCODER
137
-    register_avcodec(&msmpeg4v3_encoder);
138
-#endif //CONFIG_MSMPEG4V3_ENCODER
139
-#ifdef CONFIG_PAM_ENCODER
140
-    register_avcodec(&pam_encoder);
141
-#endif //CONFIG_PAM_ENCODER
142
-#ifdef CONFIG_PBM_ENCODER
143
-    register_avcodec(&pbm_encoder);
144
-#endif //CONFIG_PBM_ENCODER
145
-#ifdef CONFIG_PGM_ENCODER
146
-    register_avcodec(&pgm_encoder);
147
-#endif //CONFIG_PGM_ENCODER
148
-#ifdef CONFIG_PGMYUV_ENCODER
149
-    register_avcodec(&pgmyuv_encoder);
150
-#endif //CONFIG_PGMYUV_ENCODER
43
+    /* video codecs */
44
+    REGISTER_DECODER(AASC, aasc);
45
+    REGISTER_ENCDEC (ASV1, asv1);
46
+    REGISTER_ENCDEC (ASV2, asv2);
47
+    REGISTER_DECODER(AVS, avs);
48
+    REGISTER_DECODER(BMP, bmp);
49
+    REGISTER_DECODER(CAVS, cavs);
50
+    REGISTER_DECODER(CINEPAK, cinepak);
51
+    REGISTER_DECODER(CLJR, cljr);
52
+    REGISTER_DECODER(CSCD, cscd);
53
+    REGISTER_DECODER(CYUV, cyuv);
54
+    REGISTER_DECODER(DSICINVIDEO, dsicinvideo);
55
+    REGISTER_ENCDEC (DVVIDEO, dvvideo);
56
+    REGISTER_DECODER(EIGHTBPS, eightbps);
57
+    REGISTER_ENCDEC (FFV1, ffv1);
58
+    REGISTER_ENCDEC (FFVHUFF, ffvhuff);
59
+    REGISTER_DECODER(FLASHSV, flashsv);
60
+    REGISTER_DECODER(FLIC, flic);
61
+    REGISTER_ENCDEC (FLV, flv);
62
+    REGISTER_DECODER(FOURXM, fourxm);
63
+    REGISTER_DECODER(FRAPS, fraps);
64
+    REGISTER_ENCDEC (GIF, gif);
65
+    REGISTER_ENCDEC (H261, h261);
66
+    REGISTER_ENCDEC (H263, h263);
67
+    REGISTER_DECODER(H263I, h263i);
68
+    REGISTER_ENCODER(H263P, h263p);
69
+    REGISTER_DECODER(H264, h264);
70
+    REGISTER_ENCDEC (HUFFYUV, huffyuv);
71
+    REGISTER_DECODER(IDCIN, idcin);
72
+    REGISTER_DECODER(INDEO2, indeo2);
73
+    REGISTER_DECODER(INDEO3, indeo3);
74
+    REGISTER_DECODER(INTERPLAY_VIDEO, interplay_video);
75
+    REGISTER_ENCODER(JPEGLS, jpegls);
76
+    REGISTER_DECODER(KMVC, kmvc);
77
+    REGISTER_ENCODER(LJPEG, ljpeg);
78
+    REGISTER_DECODER(LOCO, loco);
79
+    REGISTER_DECODER(MDEC, mdec);
80
+    REGISTER_ENCDEC (MJPEG, mjpeg);
81
+    REGISTER_DECODER(MJPEGB, mjpegb);
82
+    REGISTER_DECODER(MMVIDEO, mmvideo);
83
+#ifdef HAVE_XVMC
84
+    REGISTER_DECODER(MPEG_XVMC, mpeg_xvmc);
85
+#endif
86
+    REGISTER_ENCDEC (MPEG1VIDEO, mpeg1video);
87
+    REGISTER_ENCDEC (MPEG2VIDEO, mpeg2video);
88
+    REGISTER_ENCDEC (MPEG4, mpeg4);
89
+    REGISTER_DECODER(MPEGVIDEO, mpegvideo);
90
+    REGISTER_ENCDEC (MSMPEG4V1, msmpeg4v1);
91
+    REGISTER_ENCDEC (MSMPEG4V2, msmpeg4v2);
92
+    REGISTER_ENCDEC (MSMPEG4V3, msmpeg4v3);
93
+    REGISTER_DECODER(MSRLE, msrle);
94
+    REGISTER_DECODER(MSVIDEO1, msvideo1);
95
+    REGISTER_DECODER(MSZH, mszh);
96
+    REGISTER_DECODER(NUV, nuv);
97
+    REGISTER_ENCODER(PAM, pam);
98
+    REGISTER_ENCODER(PBM, pbm);
99
+    REGISTER_ENCODER(PGM, pgm);
100
+    REGISTER_ENCODER(PGMYUV, pgmyuv);
151 101
 #ifdef CONFIG_ZLIB
152
-#ifdef CONFIG_PNG_ENCODER
153
-    register_avcodec(&png_encoder);
154
-#endif //CONFIG_PNG_ENCODER
155
-#endif
156
-#ifdef CONFIG_PPM_ENCODER
157
-    register_avcodec(&ppm_encoder);
158
-#endif //CONFIG_PPM_ENCODER
159
-#ifdef CONFIG_LIBVORBIS
160
-#if (defined CONFIG_OGGVORBIS_ENCODER && !defined CONFIG_VORBIS_ENCODER)
161
-    register_avcodec(&oggvorbis_encoder);
162
-#endif //CONFIG_OGGVORBIS_ENCODER
163
-#if (defined CONFIG_OGGVORBIS_DECODER && !defined CONFIG_VORBIS_DECODER)
164
-    register_avcodec(&oggvorbis_decoder);
165
-#endif //CONFIG_OGGVORBIS_DECODER
166
-#endif
167
-#ifdef CONFIG_RAWVIDEO_ENCODER
168
-    register_avcodec(&rawvideo_encoder);
169
-#endif //CONFIG_RAWVIDEO_ENCODER
170
-#ifdef CONFIG_RV10_ENCODER
171
-    register_avcodec(&rv10_encoder);
172
-#endif //CONFIG_RV10_ENCODER
173
-#ifdef CONFIG_RV20_ENCODER
174
-    register_avcodec(&rv20_encoder);
175
-#endif //CONFIG_RV20_ENCODER
176
-#ifdef CONFIG_SNOW_ENCODER
177
-    register_avcodec(&snow_encoder);
178
-#endif //CONFIG_SNOW_ENCODER
179
-#ifdef CONFIG_SONIC_ENCODER
180
-    register_avcodec(&sonic_encoder);
181
-#endif //CONFIG_SONIC_ENCODER
182
-#ifdef CONFIG_SONIC_LS_ENCODER
183
-    register_avcodec(&sonic_ls_encoder);
184
-#endif //CONFIG_SONIC_LS_ENCODER
185
-#ifdef CONFIG_SVQ1_ENCODER
186
-    register_avcodec(&svq1_encoder);
187
-#endif //CONFIG_SVQ1_ENCODER
188
-#ifdef CONFIG_VORBIS_ENCODER
189
-    register_avcodec(&vorbis_encoder);
190
-#endif //CONFIG_VORBIS_ENCODER
191
-#ifdef CONFIG_WMV1_ENCODER
192
-    register_avcodec(&wmv1_encoder);
193
-#endif //CONFIG_WMV1_ENCODER
194
-#ifdef CONFIG_WMV2_ENCODER
195
-    register_avcodec(&wmv2_encoder);
196
-#endif //CONFIG_WMV2_ENCODER
102
+    REGISTER_ENCDEC (PNG, png);
103
+#endif
104
+    REGISTER_ENCODER(PPM, ppm);
105
+    REGISTER_DECODER(QDRAW, qdraw);
106
+    REGISTER_DECODER(QPEG, qpeg);
107
+    REGISTER_DECODER(QTRLE, qtrle);
108
+    REGISTER_ENCDEC (RAWVIDEO, rawvideo);
109
+    REGISTER_DECODER(ROQ, roq);
110
+    REGISTER_DECODER(RPZA, rpza);
111
+    REGISTER_ENCDEC (RV10, rv10);
112
+    REGISTER_ENCDEC (RV20, rv20);
113
+    REGISTER_DECODER(SMACKER, smacker);
114
+    REGISTER_DECODER(SMC, smc);
115
+    REGISTER_ENCDEC (SNOW, snow);
116
+    REGISTER_DECODER(SP5X, sp5x);
117
+    REGISTER_ENCDEC (SVQ1, svq1);
118
+    REGISTER_DECODER(SVQ3, svq3);
119
+    REGISTER_DECODER(TARGA, targa);
120
+    REGISTER_DECODER(THEORA, theora);
121
+    REGISTER_DECODER(TIERTEXSEQVIDEO, tiertexseqvideo);
122
+    REGISTER_DECODER(TIFF, tiff);
123
+    REGISTER_DECODER(TRUEMOTION1, truemotion1);
124
+    REGISTER_DECODER(TRUEMOTION2, truemotion2);
125
+    REGISTER_DECODER(TSCC, tscc);
126
+    REGISTER_DECODER(ULTI, ulti);
127
+    REGISTER_DECODER(VC1, vc1);
128
+    REGISTER_DECODER(VCR1, vcr1);
129
+    REGISTER_DECODER(VMDVIDEO, vmdvideo);
130
+    REGISTER_DECODER(VMNC, vmnc);
131
+    REGISTER_DECODER(VP3, vp3);
132
+    REGISTER_DECODER(VP5, vp5);
133
+    REGISTER_DECODER(VP6, vp6);
134
+    REGISTER_DECODER(VP6F, vp6f);
135
+    REGISTER_DECODER(VQA, vqa);
136
+    REGISTER_ENCDEC (WMV1, wmv1);
137
+    REGISTER_ENCDEC (WMV2, wmv2);
138
+    REGISTER_DECODER(WMV3, wmv3);
139
+    REGISTER_DECODER(WNV1, wnv1);
197 140
 #ifdef CONFIG_X264
198
-#ifdef CONFIG_X264_ENCODER
199
-    register_avcodec(&x264_encoder);
200
-#endif //CONFIG_X264_ENCODER
141
+    REGISTER_ENCODER(X264, x264);
201 142
 #endif
143
+    REGISTER_DECODER(XAN_WC3, xan_wc3);
144
+    REGISTER_DECODER(XL, xl);
202 145
 #ifdef CONFIG_XVID
203
-#ifdef CONFIG_XVID_ENCODER
204
-    register_avcodec(&xvid_encoder);
205
-#endif //CONFIG_XVID_ENCODER
146
+    REGISTER_ENCODER(XVID, xvid);
206 147
 #endif
207
-#ifdef CONFIG_ZLIB_ENCODER
208
-    register_avcodec(&zlib_encoder);
209
-#endif //CONFIG_ZLIB_ENCODER
148
+    REGISTER_ENCDEC (ZLIB, zlib);
149
+    REGISTER_DECODER(ZMBV, zmbv);
210 150
 
211
-    /* decoders */
151
+    /* audio codecs */
212 152
 #ifdef CONFIG_FAAD
213
-#ifdef CONFIG_AAC_DECODER
214
-    register_avcodec(&aac_decoder);
215
-#endif //CONFIG_AAC_DECODER
216
-#ifdef CONFIG_MPEG4AAC_DECODER
217
-    register_avcodec(&mpeg4aac_decoder);
218
-#endif //CONFIG_MPEG4AAC_DECODER
153
+    REGISTER_DECODER(AAC, aac);
154
+    REGISTER_DECODER(MPEG4AAC, mpeg4aac);
219 155
 #endif
220
-#ifdef CONFIG_AASC_DECODER
221
-    register_avcodec(&aasc_decoder);
222
-#endif //CONFIG_AASC_DECODER
223 156
 #ifdef CONFIG_A52
224
-#ifdef CONFIG_AC3_DECODER
225
-    register_avcodec(&ac3_decoder);
226
-#endif //CONFIG_AC3_DECODER
157
+    REGISTER_DECODER(AC3, ac3);
227 158
 #endif
228
-#ifdef CONFIG_ALAC_DECODER
229
-    register_avcodec(&alac_decoder);
230
-#endif //CONFIG_ALAC_DECODER
159
+    REGISTER_ENCODER(AC3, ac3);
160
+    REGISTER_DECODER(ALAC, alac);
231 161
 #if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)
232
-#ifdef CONFIG_AMR_NB_DECODER
233
-    register_avcodec(&amr_nb_decoder);
234
-#endif //CONFIG_AMR_NB_DECODER
235
-#endif /* CONFIG_AMR_NB || CONFIG_AMR_NB_FIXED */
162
+    REGISTER_ENCDEC (AMR_NB, amr_nb);
163
+#endif
236 164
 #ifdef CONFIG_AMR_WB
237
-#ifdef CONFIG_AMR_WB_DECODER
238
-    register_avcodec(&amr_wb_decoder);
239
-#endif //CONFIG_AMR_WB_DECODER
240
-#endif /* CONFIG_AMR_WB */
241
-#ifdef CONFIG_ASV1_DECODER
242
-    register_avcodec(&asv1_decoder);
243
-#endif //CONFIG_ASV1_DECODER
244
-#ifdef CONFIG_ASV2_DECODER
245
-    register_avcodec(&asv2_decoder);
246
-#endif //CONFIG_ASV2_DECODER
247
-#ifdef CONFIG_AVS_DECODER
248
-    register_avcodec(&avs_decoder);
249
-#endif //CONFIG_AVS_DECODER
250
-#ifdef CONFIG_BMP_DECODER
251
-    register_avcodec(&bmp_decoder);
252
-#endif //CONFIG_BMP_DECODER
253
-#ifdef CONFIG_CAVS_DECODER
254
-    register_avcodec(&cavs_decoder);
255
-#endif //CONFIG_CAVS_DECODER
256
-#ifdef CONFIG_CINEPAK_DECODER
257
-    register_avcodec(&cinepak_decoder);
258
-#endif //CONFIG_CINEPAK_DECODER
259
-#ifdef CONFIG_CLJR_DECODER
260
-    register_avcodec(&cljr_decoder);
261
-#endif //CONFIG_CLJR_DECODER
262
-#ifdef CONFIG_COOK_DECODER
263
-    register_avcodec(&cook_decoder);
264
-#endif //CONFIG_COOK_DECODER
265
-#ifdef CONFIG_CSCD_DECODER
266
-    register_avcodec(&cscd_decoder);
267
-#endif //CONFIG_CSCD_DECODER
268
-#ifdef CONFIG_CYUV_DECODER
269
-    register_avcodec(&cyuv_decoder);
270
-#endif //CONFIG_CYUV_DECODER
271
-#ifdef CONFIG_DSICINAUDIO_DECODER
272
-    register_avcodec(&dsicinaudio_decoder);
273
-#endif //CONFIG_DSICINAUDIO_DECODER
274
-#ifdef CONFIG_DSICINVIDEO_DECODER
275
-    register_avcodec(&dsicinvideo_decoder);
276
-#endif //CONFIG_DSICINVIDEO_DECODER
165
+    REGISTER_ENCDEC (AMR_WB, amr_wb);
166
+#endif
167
+    REGISTER_DECODER(COOK, cook);
168
+    REGISTER_DECODER(DSICINAUDIO, dsicinaudio);
277 169
 #ifdef CONFIG_DTS
278
-#ifdef CONFIG_DTS_DECODER
279
-    register_avcodec(&dts_decoder);
280
-#endif //CONFIG_DTS_DECODER
170
+    REGISTER_DECODER(DTS, dts);
281 171
 #endif
282
-#ifdef CONFIG_DVVIDEO_DECODER
283
-    register_avcodec(&dvvideo_decoder);
284
-#endif //CONFIG_DVVIDEO_DECODER
285
-#ifdef CONFIG_EIGHTBPS_DECODER
286
-    register_avcodec(&eightbps_decoder);
287
-#endif //CONFIG_EIGHTBPS_DECODER
288
-#ifdef CONFIG_FFV1_DECODER
289
-    register_avcodec(&ffv1_decoder);
290
-#endif //CONFIG_FFV1_DECODER
291
-#ifdef CONFIG_FFVHUFF_DECODER
292
-    register_avcodec(&ffvhuff_decoder);
293
-#endif //CONFIG_FFVHUFF_DECODER
294
-#ifdef CONFIG_FLAC_DECODER
295
-    register_avcodec(&flac_decoder);
296
-#endif //CONFIG_FLAC_DECODER
297
-#ifdef CONFIG_FLASHSV_DECODER
298
-    register_avcodec(&flashsv_decoder);
299
-#endif //CONFIG_FLASHSV_DECODER
300
-#ifdef CONFIG_FLIC_DECODER
301
-    register_avcodec(&flic_decoder);
302
-#endif //CONFIG_FLIC_DECODER
303
-#ifdef CONFIG_FLV_DECODER
304
-    register_avcodec(&flv_decoder);
305
-#endif //CONFIG_FLV_DECODER
306
-#ifdef CONFIG_FOURXM_DECODER
307
-    register_avcodec(&fourxm_decoder);
308
-#endif //CONFIG_FOURXM_DECODER
309
-#ifdef CONFIG_FRAPS_DECODER
310
-    register_avcodec(&fraps_decoder);
311
-#endif //CONFIG_FRAPS_DECODER
312
-#ifdef CONFIG_GIF_DECODER
313
-    register_avcodec(&gif_decoder);
172
+#ifdef CONFIG_FAAC
173
+    REGISTER_ENCODER(FAAC, faac);
314 174
 #endif
315
-#ifdef CONFIG_H261_DECODER
316
-    register_avcodec(&h261_decoder);
317
-#endif //CONFIG_H261_DECODER
318
-#ifdef CONFIG_H263_DECODER
319
-    register_avcodec(&h263_decoder);
320
-#endif //CONFIG_H263_DECODER
321
-#ifdef CONFIG_H263I_DECODER
322
-    register_avcodec(&h263i_decoder);
323
-#endif //CONFIG_H263I_DECODER
324
-#ifdef CONFIG_H264_DECODER
325
-    register_avcodec(&h264_decoder);
326
-#endif //CONFIG_H264_DECODER
327
-#ifdef CONFIG_HUFFYUV_DECODER
328
-    register_avcodec(&huffyuv_decoder);
329
-#endif //CONFIG_HUFFYUV_DECODER
330
-#ifdef CONFIG_IDCIN_DECODER
331
-    register_avcodec(&idcin_decoder);
332
-#endif //CONFIG_IDCIN_DECODER
333
-#ifdef CONFIG_IMC_DECODER
334
-    register_avcodec(&imc_decoder);
335
-#endif //CONFIG_IMC_DECODER
336
-#ifdef CONFIG_INDEO2_DECODER
337
-    register_avcodec(&indeo2_decoder);
338
-#endif //CONFIG_INDEO2_DECODER
339
-#ifdef CONFIG_INDEO3_DECODER
340
-    register_avcodec(&indeo3_decoder);
341
-#endif //CONFIG_INDEO3_DECODER
342
-#ifdef CONFIG_INTERPLAY_DPCM_DECODER
343
-    register_avcodec(&interplay_dpcm_decoder);
344
-#endif //CONFIG_INTERPLAY_DPCM_DECODER
345
-#ifdef CONFIG_INTERPLAY_VIDEO_DECODER
346
-    register_avcodec(&interplay_video_decoder);
347
-#endif //CONFIG_INTERPLAY_VIDEO_DECODER
348
-#ifdef CONFIG_KMVC_DECODER
349
-    register_avcodec(&kmvc_decoder);
350
-#endif //CONFIG_KMVC_DECODER
175
+    REGISTER_ENCDEC (FLAC, flac);
176
+    REGISTER_DECODER(IMC, imc);
351 177
 #ifdef CONFIG_LIBGSM
352
-    register_avcodec(&libgsm_decoder);
353
-#endif //CONFIG_LIBGSM
354
-#ifdef CONFIG_LOCO_DECODER
355
-    register_avcodec(&loco_decoder);
356
-#endif //CONFIG_LOCO_DECODER
357
-#ifdef CONFIG_MACE3_DECODER
358
-    register_avcodec(&mace3_decoder);
359
-#endif //CONFIG_MACE3_DECODER
360
-#ifdef CONFIG_MACE6_DECODER
361
-    register_avcodec(&mace6_decoder);
362
-#endif //CONFIG_MACE6_DECODER
363
-#ifdef CONFIG_MDEC_DECODER
364
-    register_avcodec(&mdec_decoder);
365
-#endif //CONFIG_MDEC_DECODER
366
-#ifdef CONFIG_MJPEG_DECODER
367
-    register_avcodec(&mjpeg_decoder);
368
-#endif //CONFIG_MJPEG_DECODER
369
-#ifdef CONFIG_MJPEGB_DECODER
370
-    register_avcodec(&mjpegb_decoder);
371
-#endif //CONFIG_MJPEGB_DECODER
372
-#ifdef CONFIG_MMVIDEO_DECODER
373
-    register_avcodec(&mmvideo_decoder);
374
-#endif //CONFIG_MMVIDEO_DECODER
375
-#ifdef CONFIG_MP2_DECODER
376
-    register_avcodec(&mp2_decoder);
377
-#endif //CONFIG_MP2_DECODER
378
-#ifdef CONFIG_MP3_DECODER
379
-    register_avcodec(&mp3_decoder);
380
-#endif //CONFIG_MP3_DECODER
381
-#ifdef CONFIG_MP3ADU_DECODER
382
-    register_avcodec(&mp3adu_decoder);
383
-#endif //CONFIG_MP3ADU_DECODER
384
-#ifdef CONFIG_MP3ON4_DECODER
385
-    register_avcodec(&mp3on4_decoder);
386
-#endif //CONFIG_MP3ON4_DECODER
387
-#ifdef HAVE_XVMC
388
-#ifdef CONFIG_MPEG_XVMC_DECODER
389
-    register_avcodec(&mpeg_xvmc_decoder);
390
-#endif //CONFIG_MPEG_XVMC_DECODER
178
+    REGISTER_ENCDEC (LIBGSM, libgsm);
391 179
 #endif
392
-#ifdef CONFIG_MPEG1VIDEO_DECODER
393
-    register_avcodec(&mpeg1video_decoder);
394
-#endif //CONFIG_MPEG1VIDEO_DECODER
395
-#ifdef CONFIG_MPEG2VIDEO_DECODER
396
-    register_avcodec(&mpeg2video_decoder);
397
-#endif //CONFIG_MPEG2VIDEO_DECODER
398
-#ifdef CONFIG_MPEG4_DECODER
399
-    register_avcodec(&mpeg4_decoder);
400
-#endif //CONFIG_MPEG4_DECODER
401
-#ifdef CONFIG_MPEGVIDEO_DECODER
402
-    register_avcodec(&mpegvideo_decoder);
403
-#endif //CONFIG_MPEGVIDEO_DECODER
404
-#ifdef CONFIG_MSMPEG4V1_DECODER
405
-    register_avcodec(&msmpeg4v1_decoder);
406
-#endif //CONFIG_MSMPEG4V1_DECODER
407
-#ifdef CONFIG_MSMPEG4V2_DECODER
408
-    register_avcodec(&msmpeg4v2_decoder);
409
-#endif //CONFIG_MSMPEG4V2_DECODER
410
-#ifdef CONFIG_MSMPEG4V3_DECODER
411
-    register_avcodec(&msmpeg4v3_decoder);
412
-#endif //CONFIG_MSMPEG4V3_DECODER
413
-#ifdef CONFIG_MSRLE_DECODER
414
-    register_avcodec(&msrle_decoder);
415
-#endif //CONFIG_MSRLE_DECODER
416
-#ifdef CONFIG_MSVIDEO1_DECODER
417
-    register_avcodec(&msvideo1_decoder);
418
-#endif //CONFIG_MSVIDEO1_DECODER
419
-#ifdef CONFIG_MSZH_DECODER
420
-    register_avcodec(&mszh_decoder);
421
-#endif //CONFIG_MSZH_DECODER
422
-#ifdef CONFIG_NUV_DECODER
423
-    register_avcodec(&nuv_decoder);
424
-#endif //CONFIG_NUV_DECODER
425
-#ifdef CONFIG_ZLIB
426
-#ifdef CONFIG_PNG_DECODER
427
-    register_avcodec(&png_decoder);
428
-#endif //CONFIG_PNG_DECODER
180
+    REGISTER_DECODER(MACE3, mace3);
181
+    REGISTER_DECODER(MACE6, mace6);
182
+    REGISTER_ENCDEC (MP2, mp2);
183
+    REGISTER_DECODER(MP3, mp3);
184
+    REGISTER_DECODER(MP3ADU, mp3adu);
185
+#ifdef CONFIG_MP3LAME
186
+    REGISTER_ENCODER(MP3LAME, mp3lame);
429 187
 #endif
430
-#ifdef CONFIG_QDM2_DECODER
431
-    register_avcodec(&qdm2_decoder);
432
-#endif //CONFIG_QDM2_DECODER
433
-#ifdef CONFIG_QDRAW_DECODER
434
-    register_avcodec(&qdraw_decoder);
435
-#endif //CONFIG_QDRAW_DECODER
436
-#ifdef CONFIG_QPEG_DECODER
437
-    register_avcodec(&qpeg_decoder);
438
-#endif //CONFIG_QPEG_DECODER
439
-#ifdef CONFIG_QTRLE_DECODER
440
-    register_avcodec(&qtrle_decoder);
441
-#endif //CONFIG_QTRLE_DECODER
442
-#ifdef CONFIG_RA_144_DECODER
443
-    register_avcodec(&ra_144_decoder);
444
-#endif //CONFIG_RA_144_DECODER
445
-#ifdef CONFIG_RA_288_DECODER
446
-    register_avcodec(&ra_288_decoder);
447
-#endif //CONFIG_RA_288_DECODER
448
-#ifdef CONFIG_RAWVIDEO_DECODER
449
-    register_avcodec(&rawvideo_decoder);
450
-#endif //CONFIG_RAWVIDEO_DECODER
451
-#ifdef CONFIG_ROQ_DECODER
452
-    register_avcodec(&roq_decoder);
453
-#endif //CONFIG_ROQ_DECODER
454
-#ifdef CONFIG_ROQ_DPCM_DECODER
455
-    register_avcodec(&roq_dpcm_decoder);
456
-#endif //CONFIG_ROQ_DPCM_DECODER
457
-#ifdef CONFIG_RPZA_DECODER
458
-    register_avcodec(&rpza_decoder);
459
-#endif //CONFIG_RPZA_DECODER
460
-#ifdef CONFIG_RV10_DECODER
461
-    register_avcodec(&rv10_decoder);
462
-#endif //CONFIG_RV10_DECODER
463
-#ifdef CONFIG_RV20_DECODER
464
-    register_avcodec(&rv20_decoder);
465
-#endif //CONFIG_RV20_DECODER
466
-#ifdef CONFIG_SHORTEN_DECODER
467
-    register_avcodec(&shorten_decoder);
468
-#endif //CONFIG_SHORTEN_DECODER
469
-#ifdef CONFIG_SMACKAUD_DECODER
470
-    register_avcodec(&smackaud_decoder);
471
-#endif //CONFIG_SMACKAUD_DECODER
472
-#ifdef CONFIG_SMACKER_DECODER
473
-    register_avcodec(&smacker_decoder);
474
-#endif //CONFIG_SMACKER_DECODER
475
-#ifdef CONFIG_SMC_DECODER
476
-    register_avcodec(&smc_decoder);
477
-#endif //CONFIG_SMC_DECODER
478
-#ifdef CONFIG_SNOW_DECODER
479
-    register_avcodec(&snow_decoder);
480
-#endif //CONFIG_SNOW_DECODER
481
-#ifdef CONFIG_SOL_DPCM_DECODER
482
-    register_avcodec(&sol_dpcm_decoder);
483
-#endif //CONFIG_SOL_DPCM_DECODER
484
-#ifdef CONFIG_SONIC_DECODER
485
-    register_avcodec(&sonic_decoder);
486
-#endif //CONFIG_SONIC_DECODER
487
-#ifdef CONFIG_SP5X_DECODER
488
-    register_avcodec(&sp5x_decoder);
489
-#endif //CONFIG_SP5X_DECODER
490
-#ifdef CONFIG_SVQ1_DECODER
491
-    register_avcodec(&svq1_decoder);
492
-#endif //CONFIG_SVQ1_DECODER
493
-#ifdef CONFIG_SVQ3_DECODER
494
-    register_avcodec(&svq3_decoder);
495
-#endif //CONFIG_SVQ3_DECODER
496
-#ifdef CONFIG_TARGA_DECODER
497
-    register_avcodec(&targa_decoder);
498
-#endif //CONFIG_TARGA_DECODER
499
-#ifdef CONFIG_THEORA_DECODER
500
-    register_avcodec(&theora_decoder);
501
-#endif //CONFIG_THEORA_DECODER
502
-#ifdef CONFIG_TIERTEXSEQVIDEO_DECODER
503
-    register_avcodec(&tiertexseqvideo_decoder);
504
-#endif //CONFIG_TIERTEXSEQVIDEO_DECODER
505
-#ifdef CONFIG_TIFF_DECODER
506
-    register_avcodec(&tiff_decoder);
507
-#endif //CONFIG_TIFF_DECODER
508
-#ifdef CONFIG_TRUEMOTION1_DECODER
509
-    register_avcodec(&truemotion1_decoder);
510
-#endif //CONFIG_TRUEMOTION1_DECODER
511
-#ifdef CONFIG_TRUEMOTION2_DECODER
512
-    register_avcodec(&truemotion2_decoder);
513
-#endif //CONFIG_TRUEMOTION2_DECODER
514
-#ifdef CONFIG_TRUESPEECH_DECODER
515
-    register_avcodec(&truespeech_decoder);
516
-#endif //CONFIG_TRUESPEECH_DECODER
517
-#ifdef CONFIG_TSCC_DECODER
518
-    register_avcodec(&tscc_decoder);
519
-#endif //CONFIG_TSCC_DECODER
520
-#ifdef CONFIG_TTA_DECODER
521
-    register_avcodec(&tta_decoder);
522
-#endif //CONFIG_TTA_DECODER
523
-#ifdef CONFIG_ULTI_DECODER
524
-    register_avcodec(&ulti_decoder);
525
-#endif //CONFIG_ULTI_DECODER
526
-#ifdef CONFIG_VC1_DECODER
527
-    register_avcodec(&vc1_decoder);
528
-#endif //CONFIG_VC1_DECODER
529
-#ifdef CONFIG_VCR1_DECODER
530
-    register_avcodec(&vcr1_decoder);
531
-#endif //CONFIG_VCR1_DECODER
532
-#ifdef CONFIG_VMDAUDIO_DECODER
533
-    register_avcodec(&vmdaudio_decoder);
534
-#endif //CONFIG_VMDAUDIO_DECODER
535
-#ifdef CONFIG_VMDVIDEO_DECODER
536
-    register_avcodec(&vmdvideo_decoder);
537
-#endif //CONFIG_VMDVIDEO_DECODER
538
-#ifdef CONFIG_VMNC_DECODER
539
-    register_avcodec(&vmnc_decoder);
540
-#endif //CONFIG_VMNC_DECODER
541
-#ifdef CONFIG_VORBIS_DECODER
542
-    register_avcodec(&vorbis_decoder);
543
-#endif //CONFIG_VORBIS_DECODER
544
-#ifdef CONFIG_VP3_DECODER
545
-    register_avcodec(&vp3_decoder);
546
-#endif //CONFIG_VP3_DECODER
547
-#ifdef CONFIG_VP5_DECODER
548
-    register_avcodec(&vp5_decoder);
549
-#endif //CONFIG_VP5_DECODER
550
-#ifdef CONFIG_VP6_DECODER
551
-    register_avcodec(&vp6_decoder);
552
-#endif //CONFIG_VP6_DECODER
553
-#ifdef CONFIG_VP6F_DECODER
554
-    register_avcodec(&vp6f_decoder);
555
-#endif //CONFIG_VP6F_DECODER
556
-#ifdef CONFIG_VQA_DECODER
557
-    register_avcodec(&vqa_decoder);
558
-#endif //CONFIG_VQA_DECODER
559
-#ifdef CONFIG_WAVPACK_DECODER
560
-    register_avcodec(&wavpack_decoder);
561
-#endif //CONFIG_WAVPACK_DECODER
562
-#ifdef CONFIG_WMAV1_DECODER
563
-    register_avcodec(&wmav1_decoder);
564
-#endif //CONFIG_WMAV1_DECODER
565
-#ifdef CONFIG_WMAV2_DECODER
566
-    register_avcodec(&wmav2_decoder);
567
-#endif //CONFIG_WMAV2_DECODER
568
-#ifdef CONFIG_WMV1_DECODER
569
-    register_avcodec(&wmv1_decoder);
570
-#endif //CONFIG_WMV1_DECODER
571
-#ifdef CONFIG_WMV2_DECODER
572
-    register_avcodec(&wmv2_decoder);
573
-#endif //CONFIG_WMV2_DECODER
574
-#ifdef CONFIG_WMV3_DECODER
575
-    register_avcodec(&wmv3_decoder);
576
-#endif //CONFIG_WMV3_DECODER
577
-#ifdef CONFIG_WNV1_DECODER
578
-    register_avcodec(&wnv1_decoder);
579
-#endif //CONFIG_WNV1_DECODER
580
-#ifdef CONFIG_WS_SND1_DECODER
581
-    register_avcodec(&ws_snd1_decoder);
582
-#endif //CONFIG_WS_SND1_DECODER
583
-#ifdef CONFIG_XAN_DPCM_DECODER
584
-    register_avcodec(&xan_dpcm_decoder);
585
-#endif //CONFIG_XAN_DPCM_DECODER
586
-#ifdef CONFIG_XAN_WC3_DECODER
587
-    register_avcodec(&xan_wc3_decoder);
588
-#endif //CONFIG_XAN_WC3_DECODER
589
-#ifdef CONFIG_XL_DECODER
590
-    register_avcodec(&xl_decoder);
591
-#endif //CONFIG_XL_DECODER
592
-#ifdef CONFIG_ZLIB_DECODER
593
-    register_avcodec(&zlib_decoder);
594
-#endif //CONFIG_ZLIB_DECODER
595
-#ifdef CONFIG_ZMBV_DECODER
596
-    register_avcodec(&zmbv_decoder);
597
-#endif //CONFIG_ZMBV_DECODER
188
+    REGISTER_DECODER(MP3ON4, mp3on4);
189
+#ifdef CONFIG_LIBVORBIS
190
+    if (!ENABLE_VORBIS_ENCODER)  REGISTER_ENCODER(OGGVORBIS, oggvorbis);
191
+    if (!ENABLE_VORBIS_DECODER)  REGISTER_DECODER(OGGVORBIS, oggvorbis);
192
+#endif
193
+    REGISTER_DECODER(QDM2, qdm2);
194
+    REGISTER_DECODER(RA_144, ra_144);
195
+    REGISTER_DECODER(RA_288, ra_288);
196
+    REGISTER_DECODER(SHORTEN, shorten);
197
+    REGISTER_DECODER(SMACKAUD, smackaud);
198
+    REGISTER_ENCDEC (SONIC, sonic);
199
+    REGISTER_ENCODER(SONIC_LS, sonic_ls);
200
+    REGISTER_DECODER(TRUESPEECH, truespeech);
201
+    REGISTER_DECODER(TTA, tta);
202
+    REGISTER_DECODER(VMDAUDIO, vmdaudio);
203
+    REGISTER_ENCDEC (VORBIS, vorbis);
204
+    REGISTER_DECODER(WAVPACK, wavpack);
205
+    REGISTER_DECODER(WMAV1, wmav1);
206
+    REGISTER_DECODER(WMAV2, wmav2);
207
+    REGISTER_DECODER(WS_SND1, ws_snd1);
598 208
 
599 209
     /* pcm codecs */
600
-#ifdef CONFIG_PCM_ALAW_DECODER
601
-    register_avcodec(&pcm_alaw_decoder);
602
-#endif
603
-#ifdef CONFIG_PCM_ALAW_ENCODER
604
-    register_avcodec(&pcm_alaw_encoder);
605
-#endif
606
-#ifdef CONFIG_PCM_MULAW_DECODER
607
-    register_avcodec(&pcm_mulaw_decoder);
608
-#endif
609
-#ifdef CONFIG_PCM_MULAW_ENCODER
610
-    register_avcodec(&pcm_mulaw_encoder);
611
-#endif
612
-#ifdef CONFIG_PCM_S8_DECODER
613
-    register_avcodec(&pcm_s8_decoder);
614
-#endif
615
-#ifdef CONFIG_PCM_S8_ENCODER
616
-    register_avcodec(&pcm_s8_encoder);
617
-#endif
618
-#ifdef CONFIG_PCM_S16BE_DECODER
619
-    register_avcodec(&pcm_s16be_decoder);
620
-#endif
621
-#ifdef CONFIG_PCM_S16BE_ENCODER
622
-    register_avcodec(&pcm_s16be_encoder);
623
-#endif
624
-#ifdef CONFIG_PCM_S16LE_DECODER
625
-    register_avcodec(&pcm_s16le_decoder);
626
-#endif
627
-#ifdef CONFIG_PCM_S16LE_ENCODER
628
-    register_avcodec(&pcm_s16le_encoder);
629
-#endif
630
-#ifdef CONFIG_PCM_S24BE_DECODER
631
-    register_avcodec(&pcm_s24be_decoder);
632
-#endif
633
-#ifdef CONFIG_PCM_S24BE_ENCODER
634
-    register_avcodec(&pcm_s24be_encoder);
635
-#endif
636
-#ifdef CONFIG_PCM_S24DAUD_DECODER
637
-    register_avcodec(&pcm_s24daud_decoder);
638
-#endif
639
-#ifdef CONFIG_PCM_S24DAUD_ENCODER
640
-    register_avcodec(&pcm_s24daud_encoder);
641
-#endif
642
-#ifdef CONFIG_PCM_S24LE_DECODER
643
-    register_avcodec(&pcm_s24le_decoder);
644
-#endif
645
-#ifdef CONFIG_PCM_S24LE_ENCODER
646
-    register_avcodec(&pcm_s24le_encoder);
647
-#endif
648
-#ifdef CONFIG_PCM_S32BE_DECODER
649
-    register_avcodec(&pcm_s32be_decoder);
650
-#endif
651
-#ifdef CONFIG_PCM_S32BE_ENCODER
652
-    register_avcodec(&pcm_s32be_encoder);
653
-#endif
654
-#ifdef CONFIG_PCM_S32LE_DECODER
655
-    register_avcodec(&pcm_s32le_decoder);
656
-#endif
657
-#ifdef CONFIG_PCM_S32LE_ENCODER
658
-    register_avcodec(&pcm_s32le_encoder);
659
-#endif
660
-#ifdef CONFIG_PCM_U8_DECODER
661
-    register_avcodec(&pcm_u8_decoder);
662
-#endif
663
-#ifdef CONFIG_PCM_U8_ENCODER
664
-    register_avcodec(&pcm_u8_encoder);
665
-#endif
666
-#ifdef CONFIG_PCM_U16BE_DECODER
667
-    register_avcodec(&pcm_u16be_decoder);
668
-#endif
669
-#ifdef CONFIG_PCM_U16BE_ENCODER
670
-    register_avcodec(&pcm_u16be_encoder);
671
-#endif
672
-#ifdef CONFIG_PCM_U16LE_DECODER
673
-    register_avcodec(&pcm_u16le_decoder);
674
-#endif
675
-#ifdef CONFIG_PCM_U16LE_ENCODER
676
-    register_avcodec(&pcm_u16le_encoder);
677
-#endif
678
-#ifdef CONFIG_PCM_U24BE_DECODER
679
-    register_avcodec(&pcm_u24be_decoder);
680
-#endif
681
-#ifdef CONFIG_PCM_U24BE_ENCODER
682
-    register_avcodec(&pcm_u24be_encoder);
683
-#endif
684
-#ifdef CONFIG_PCM_U24LE_DECODER
685
-    register_avcodec(&pcm_u24le_decoder);
686
-#endif
687
-#ifdef CONFIG_PCM_U24LE_ENCODER
688
-    register_avcodec(&pcm_u24le_encoder);
689
-#endif
690
-#ifdef CONFIG_PCM_U32BE_DECODER
691
-    register_avcodec(&pcm_u32be_decoder);
692
-#endif
693
-#ifdef CONFIG_PCM_U32BE_ENCODER
694
-    register_avcodec(&pcm_u32be_encoder);
695
-#endif
696
-#ifdef CONFIG_PCM_U32LE_DECODER
697
-    register_avcodec(&pcm_u32le_decoder);
698
-#endif
699
-#ifdef CONFIG_PCM_U32LE_ENCODER
700
-    register_avcodec(&pcm_u32le_encoder);
701
-#endif
210
+    REGISTER_ENCDEC (PCM_ALAW, pcm_alaw);
211
+    REGISTER_ENCDEC (PCM_MULAW, pcm_mulaw);
212
+    REGISTER_ENCDEC (PCM_S8, pcm_s8);
213
+    REGISTER_ENCDEC (PCM_S16BE, pcm_s16be);
214
+    REGISTER_ENCDEC (PCM_S16LE, pcm_s16le);
215
+    REGISTER_ENCDEC (PCM_S24BE, pcm_s24be);
216
+    REGISTER_ENCDEC (PCM_S24DAUD, pcm_s24daud);
217
+    REGISTER_ENCDEC (PCM_S24LE, pcm_s24le);
218
+    REGISTER_ENCDEC (PCM_S32BE, pcm_s32be);
219
+    REGISTER_ENCDEC (PCM_S32LE, pcm_s32le);
220
+    REGISTER_ENCDEC (PCM_U8, pcm_u8);
221
+    REGISTER_ENCDEC (PCM_U16BE, pcm_u16be);
222
+    REGISTER_ENCDEC (PCM_U16LE, pcm_u16le);
223
+    REGISTER_ENCDEC (PCM_U24BE, pcm_u24be);
224
+    REGISTER_ENCDEC (PCM_U24LE, pcm_u24le);
225
+    REGISTER_ENCDEC (PCM_U32BE, pcm_u32be);
226
+    REGISTER_ENCDEC (PCM_U32LE, pcm_u32le);
702 227
 
703
-   /* adpcm codecs */
704
-#ifdef CONFIG_ADPCM_4XM_DECODER
705
-    register_avcodec(&adpcm_4xm_decoder);
706
-#endif
707
-#ifdef CONFIG_ADPCM_4XM_ENCODER
708
-    register_avcodec(&adpcm_4xm_encoder);
709
-#endif
710
-#ifdef CONFIG_ADPCM_ADX_DECODER
711
-    register_avcodec(&adpcm_adx_decoder);
712
-#endif
713
-#ifdef CONFIG_ADPCM_ADX_ENCODER
714
-    register_avcodec(&adpcm_adx_encoder);
715
-#endif
716
-#ifdef CONFIG_ADPCM_CT_DECODER
717
-    register_avcodec(&adpcm_ct_decoder);
718
-#endif
719
-#ifdef CONFIG_ADPCM_CT_ENCODER
720
-    register_avcodec(&adpcm_ct_encoder);
721
-#endif
722
-#ifdef CONFIG_ADPCM_EA_DECODER
723
-    register_avcodec(&adpcm_ea_decoder);
724
-#endif
725
-#ifdef CONFIG_ADPCM_EA_ENCODER
726
-    register_avcodec(&adpcm_ea_encoder);
727
-#endif
728
-#ifdef CONFIG_ADPCM_G726_DECODER
729
-    register_avcodec(&adpcm_g726_decoder);
730
-#endif
731
-#ifdef CONFIG_ADPCM_G726_ENCODER
732
-    register_avcodec(&adpcm_g726_encoder);
733
-#endif
734
-#ifdef CONFIG_ADPCM_IMA_DK3_DECODER
735
-    register_avcodec(&adpcm_ima_dk3_decoder);
736
-#endif
737
-#ifdef CONFIG_ADPCM_IMA_DK3_ENCODER
738
-    register_avcodec(&adpcm_ima_dk3_encoder);
739
-#endif
740
-#ifdef CONFIG_ADPCM_IMA_DK4_DECODER
741
-    register_avcodec(&adpcm_ima_dk4_decoder);
742
-#endif
743
-#ifdef CONFIG_ADPCM_IMA_DK4_ENCODER
744
-    register_avcodec(&adpcm_ima_dk4_encoder);
745
-#endif
746
-#ifdef CONFIG_ADPCM_IMA_QT_DECODER
747
-    register_avcodec(&adpcm_ima_qt_decoder);
748
-#endif
749
-#ifdef CONFIG_ADPCM_IMA_QT_ENCODER
750
-    register_avcodec(&adpcm_ima_qt_encoder);
751
-#endif
752
-#ifdef CONFIG_ADPCM_IMA_SMJPEG_DECODER
753
-    register_avcodec(&adpcm_ima_smjpeg_decoder);
754
-#endif
755
-#ifdef CONFIG_ADPCM_IMA_SMJPEG_ENCODER
756
-    register_avcodec(&adpcm_ima_smjpeg_encoder);
757
-#endif
758
-#ifdef CONFIG_ADPCM_IMA_WAV_DECODER
759
-    register_avcodec(&adpcm_ima_wav_decoder);
760
-#endif
761
-#ifdef CONFIG_ADPCM_IMA_WAV_ENCODER
762
-    register_avcodec(&adpcm_ima_wav_encoder);
763
-#endif
764
-#ifdef CONFIG_ADPCM_IMA_WS_DECODER
765
-    register_avcodec(&adpcm_ima_ws_decoder);
766
-#endif
767
-#ifdef CONFIG_ADPCM_IMA_WS_ENCODER
768
-    register_avcodec(&adpcm_ima_ws_encoder);
769
-#endif
770
-#ifdef CONFIG_ADPCM_MS_DECODER
771
-    register_avcodec(&adpcm_ms_decoder);
772
-#endif
773
-#ifdef CONFIG_ADPCM_MS_ENCODER
774
-    register_avcodec(&adpcm_ms_encoder);
775
-#endif
776
-#ifdef CONFIG_ADPCM_SBPRO_2_DECODER
777
-    register_avcodec(&adpcm_sbpro_2_decoder);
778
-#endif
779
-#ifdef CONFIG_ADPCM_SBPRO_2_ENCODER
780
-    register_avcodec(&adpcm_sbpro_2_encoder);
781
-#endif
782
-#ifdef CONFIG_ADPCM_SBPRO_3_DECODER
783
-    register_avcodec(&adpcm_sbpro_3_decoder);
784
-#endif
785
-#ifdef CONFIG_ADPCM_SBPRO_3_ENCODER
786
-    register_avcodec(&adpcm_sbpro_3_encoder);
787
-#endif
788
-#ifdef CONFIG_ADPCM_SBPRO_4_DECODER
789
-    register_avcodec(&adpcm_sbpro_4_decoder);
790
-#endif
791
-#ifdef CONFIG_ADPCM_SBPRO_4_ENCODER
792
-    register_avcodec(&adpcm_sbpro_4_encoder);
793
-#endif
794
-#ifdef CONFIG_ADPCM_SWF_DECODER
795
-    register_avcodec(&adpcm_swf_decoder);
796
-#endif
797
-#ifdef CONFIG_ADPCM_SWF_ENCODER
798
-    register_avcodec(&adpcm_swf_encoder);
799
-#endif
800
-#ifdef CONFIG_ADPCM_XA_DECODER
801
-    register_avcodec(&adpcm_xa_decoder);
802
-#endif
803
-#ifdef CONFIG_ADPCM_XA_ENCODER
804
-    register_avcodec(&adpcm_xa_encoder);
805
-#endif
806
-#ifdef CONFIG_ADPCM_YAMAHA_DECODER
807
-    register_avcodec(&adpcm_yamaha_decoder);
808
-#endif
809
-#ifdef CONFIG_ADPCM_YAMAHA_ENCODER
810
-    register_avcodec(&adpcm_yamaha_encoder);
811
-#endif
228
+    /* dpcm codecs */
229
+    REGISTER_DECODER(INTERPLAY_DPCM, interplay_dpcm);
230
+    REGISTER_DECODER(ROQ_DPCM, roq_dpcm);
231
+    REGISTER_DECODER(SOL_DPCM, sol_dpcm);
232
+    REGISTER_DECODER(XAN_DPCM, xan_dpcm);
233
+
234
+    /* adpcm codecs */
235
+    REGISTER_ENCDEC (ADPCM_4XM, adpcm_4xm);
236
+    REGISTER_ENCDEC (ADPCM_ADX, adpcm_adx);
237
+    REGISTER_ENCDEC (ADPCM_CT, adpcm_ct);
238
+    REGISTER_ENCDEC (ADPCM_EA, adpcm_ea);
239
+    REGISTER_ENCDEC (ADPCM_G726, adpcm_g726);
240
+    REGISTER_ENCDEC (ADPCM_IMA_DK3, adpcm_ima_dk3);
241
+    REGISTER_ENCDEC (ADPCM_IMA_DK4, adpcm_ima_dk4);
242
+    REGISTER_ENCDEC (ADPCM_IMA_QT, adpcm_ima_qt);
243
+    REGISTER_ENCDEC (ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg);
244
+    REGISTER_ENCDEC (ADPCM_IMA_WAV, adpcm_ima_wav);
245
+    REGISTER_ENCDEC (ADPCM_IMA_WS, adpcm_ima_ws);
246
+    REGISTER_ENCDEC (ADPCM_MS, adpcm_ms);
247
+    REGISTER_ENCDEC (ADPCM_SBPRO_2, adpcm_sbpro_2);
248
+    REGISTER_ENCDEC (ADPCM_SBPRO_3, adpcm_sbpro_3);
249
+    REGISTER_ENCDEC (ADPCM_SBPRO_4, adpcm_sbpro_4);
250
+    REGISTER_ENCDEC (ADPCM_SWF, adpcm_swf);
251
+    REGISTER_ENCDEC (ADPCM_XA, adpcm_xa);
252
+    REGISTER_ENCDEC (ADPCM_YAMAHA, adpcm_yamaha);
812 253
 
813 254
     /* subtitles */
814
-#ifdef CONFIG_DVBSUB_DECODER
815
-    register_avcodec(&dvbsub_decoder);
816
-#endif
817
-#ifdef CONFIG_DVBSUB_ENCODER
818
-    register_avcodec(&dvbsub_encoder);
819
-#endif
820
-#ifdef CONFIG_DVDSUB_DECODER
821
-    register_avcodec(&dvdsub_decoder);
822
-#endif
823
-#ifdef CONFIG_DVDSUB_ENCODER
824
-    register_avcodec(&dvdsub_encoder);
825
-#endif
255
+    REGISTER_ENCDEC (DVBSUB, dvbsub);
256
+    REGISTER_ENCDEC (DVDSUB, dvdsub);
826 257
 
827 258
     /* parsers */
828
-#ifdef CONFIG_AAC_PARSER
829
-    av_register_codec_parser(&aac_parser);
830
-#endif
831
-#ifdef CONFIG_AC3_PARSER
832
-    av_register_codec_parser(&ac3_parser);
833
-#endif
834
-#ifdef CONFIG_CAVSVIDEO_PARSER
835
-    av_register_codec_parser(&cavsvideo_parser);
836
-#endif
837
-#ifdef CONFIG_DVBSUB_PARSER
838
-    av_register_codec_parser(&dvbsub_parser);
839
-#endif
840
-#ifdef CONFIG_DVDSUB_PARSER
841
-    av_register_codec_parser(&dvdsub_parser);
842
-#endif
843
-#ifdef CONFIG_H261_PARSER
844
-    av_register_codec_parser(&h261_parser);
845
-#endif
846
-#ifdef CONFIG_H263_PARSER
847
-    av_register_codec_parser(&h263_parser);
848
-#endif
849
-#ifdef CONFIG_H264_PARSER
850
-    av_register_codec_parser(&h264_parser);
851
-#endif
852
-#ifdef CONFIG_MJPEG_PARSER
853
-    av_register_codec_parser(&mjpeg_parser);
854
-#endif
855
-#ifdef CONFIG_MPEG4VIDEO_PARSER
856
-    av_register_codec_parser(&mpeg4video_parser);
857
-#endif
858
-#ifdef CONFIG_MPEGAUDIO_PARSER
859
-    av_register_codec_parser(&mpegaudio_parser);
860
-#endif
861
-#ifdef CONFIG_MPEGVIDEO_PARSER
862
-    av_register_codec_parser(&mpegvideo_parser);
863
-#endif
864
-#ifdef CONFIG_PNM_PARSER
865
-    av_register_codec_parser(&pnm_parser);
866
-#endif
259
+    REGISTER_PARSER (AAC, aac);
260
+    REGISTER_PARSER (AC3, ac3);
261
+    REGISTER_PARSER (CAVSVIDEO, cavsvideo);
262
+    REGISTER_PARSER (DVBSUB, dvbsub);
263
+    REGISTER_PARSER (DVDSUB, dvdsub);
264
+    REGISTER_PARSER (H261, h261);
265
+    REGISTER_PARSER (H263, h263);
266
+    REGISTER_PARSER (H264, h264);
267
+    REGISTER_PARSER (MJPEG, mjpeg);
268
+    REGISTER_PARSER (MPEG4VIDEO, mpeg4video);
269
+    REGISTER_PARSER (MPEGAUDIO, mpegaudio);
270
+    REGISTER_PARSER (MPEGVIDEO, mpegvideo);
271
+    REGISTER_PARSER (PNM, pnm);
867 272
 
868 273
     av_register_bitstream_filter(&dump_extradata_bsf);
869 274
     av_register_bitstream_filter(&remove_extradata_bsf);