[SCM] libav/experimental: split definition of PCM_CODEC into PCM_ENCODER and PCM_DECODER

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:09:08 UTC 2013


The following commit has been merged in the experimental branch:
commit 2b045c9caafa1e64933c6b441510510341f9ad2d
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Wed Nov 7 22:54:31 2007 +0000

    split definition of PCM_CODEC into PCM_ENCODER and PCM_DECODER
    
    Originally committed as revision 10946 to svn://svn.ffmpeg.org/ffmpeg/trunk

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);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list