# HG changeset patch # User diego # Date 1236095332 0 # Node ID 21f500327e5c10f4e21383f68099868c210e5dba # Parent 79818b0595c0f2f14740be235c6803019cf03c24 Do not use a macro to generate a single AVCodec declaration. diff -r 79818b0595c0 -r 21f500327e5c libfaad.c --- a/libfaad.c Tue Mar 03 14:32:24 2009 +0000 +++ b/libfaad.c Tue Mar 03 15:48:52 2009 +0000 @@ -318,20 +318,14 @@ 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