# HG changeset patch # User diego # Date 1150452417 0 # Node ID 787a70a8b867adf2b2c6084b8cd1d1b78b17ec12 # Parent 801d4a5cf353e26d414851cf72e03ee781f8c73a Fix compilation with all combinations of --disable-(de)muxers. diff -r 801d4a5cf353 -r 787a70a8b867 raw.c --- a/raw.c Fri Jun 16 07:54:37 2006 +0000 +++ b/raw.c Fri Jun 16 10:06:57 2006 +0000 @@ -678,16 +678,7 @@ .value = codec,\ }; -#if !defined(CONFIG_MUXERS) && defined(CONFIG_DEMUXERS) - -#define PCMDEF(name, long_name, ext, codec) \ - PCMINPUTDEF(name, long_name, ext, codec) - -#else - -#define PCMDEF(name, long_name, ext, codec) \ - PCMINPUTDEF(name, long_name, ext, codec)\ -\ +#define PCMOUTPUTDEF(name, long_name, ext, codec) \ AVOutputFormat pcm_ ## name ## _oformat = {\ #name,\ long_name,\ @@ -700,7 +691,21 @@ raw_write_packet,\ raw_write_trailer,\ }; -#endif //CONFIG_MUXERS + + +#if !defined(CONFIG_MUXERS) && defined(CONFIG_DEMUXERS) +#define PCMDEF(name, long_name, ext, codec) \ + PCMINPUTDEF(name, long_name, ext, codec) +#elif defined(CONFIG_MUXERS) && !defined(CONFIG_DEMUXERS) +#define PCMDEF(name, long_name, ext, codec) \ + PCMOUTPUTDEF(name, long_name, ext, codec) +#elif defined(CONFIG_MUXERS) && defined(CONFIG_DEMUXERS) +#define PCMDEF(name, long_name, ext, codec) \ + PCMINPUTDEF(name, long_name, ext, codec)\ + PCMOUTPUTDEF(name, long_name, ext, codec) +#else +#define PCMDEF(name, long_name, ext, codec) +#endif #ifdef WORDS_BIGENDIAN #define BE_DEF(s) s