diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-03-03 15:48:52 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-03-03 15:48:52 +0000 |
| commit | 59701aeb46bf06b692f9952c705b049eaabda10a (patch) | |
| tree | 8f6c78de6e486713668d4bfd6130b52c15d9cab4 | |
| parent | dc7d978a054b851113cfb420da6866cb4c1b0b64 (diff) | |
| download | ffmpeg-59701aeb46bf06b692f9952c705b049eaabda10a.tar.gz | |
Do not use a macro to generate a single AVCodec declaration.
Originally committed as revision 17773 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/libfaad.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/libavcodec/libfaad.c b/libavcodec/libfaad.c index 2cb2597c4b..98d23097f6 100644 --- a/libavcodec/libfaad.c +++ b/libavcodec/libfaad.c @@ -318,20 +318,14 @@ static av_cold int faac_decode_init(AVCodecContext *avctx) return 0; } -#define AAC_CODEC(id, name, long_name_) \ -AVCodec name ## _decoder = { \ - #name, \ - CODEC_TYPE_AUDIO, \ - id, \ - sizeof(FAACContext), \ - faac_decode_init, \ - NULL, \ - faac_decode_end, \ - faac_decode_frame, \ - .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ +AVCodec libfaad_decoder = { + libfaad, + CODEC_TYPE_AUDIO, + CODEC_ID_AAC, + sizeof(FAACContext), + faac_decode_init, + NULL, + faac_decode_end, + faac_decode_frame, + .long_name = NULL_IF_CONFIG_SMALL("libfaad AAC (Advanced Audio Codec)"), } - -// FIXME - raw AAC files - maybe just one entry will be enough -AAC_CODEC(CODEC_ID_AAC, libfaad, "libfaad AAC (Advanced Audio Codec)"); - -#undef AAC_CODEC |