From 2b045c9caafa1e64933c6b441510510341f9ad2d Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Wed, 7 Nov 2007 22:54:31 +0000 Subject: [PATCH] split definition of PCM_CODEC into PCM_ENCODER and PCM_DECODER Originally committed as revision 10946 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/pcm.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index c4ed107..d070628 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -483,7 +483,8 @@ static int pcm_decode_frame(AVCodecContext *avctx, return src - buf; } -#define PCM_CODEC(id, name) \ +#ifdef CONFIG_ENCODERS +#define PCM_ENCODER(id,name) \ AVCodec name ## _encoder = { \ #name, \ CODEC_TYPE_AUDIO, \ @@ -493,7 +494,13 @@ AVCodec name ## _encoder = { \ pcm_encode_frame, \ pcm_encode_close, \ NULL, \ -}; \ +}; +#else +#define PCM_ENCODER(id,name) +#endif + +#ifdef CONFIG_DECODERS +#define PCM_DECODER(id,name) \ AVCodec name ## _decoder = { \ #name, \ CODEC_TYPE_AUDIO, \ @@ -503,7 +510,13 @@ AVCodec name ## _decoder = { \ NULL, \ NULL, \ pcm_decode_frame, \ -} +}; +#else +#define PCM_DECODER(id,name) +#endif + +#define PCM_CODEC(id, name) \ +PCM_ENCODER(id,name) PCM_DECODER(id,name) PCM_CODEC(CODEC_ID_PCM_S32LE, pcm_s32le); PCM_CODEC(CODEC_ID_PCM_S32BE, pcm_s32be); -- 2.7.4