[FFmpeg-cvslog] libopencore-amr: Conditionally compile decoder and encoder bits

Diego Biurrun git at videolan.org
Tue Feb 19 01:25:07 CET 2013


ffmpeg | branch: release/1.1 | Diego Biurrun <diego at biurrun.de> | Sat Feb 16 23:05:03 2013 +0100| [e492818d8925d63548c859ae560cadc852b4d297] | committer: Luca Barbato

libopencore-amr: Conditionally compile decoder and encoder bits

CC: libav-stable at libav.org
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
(cherry picked from commit f6ad3ca159edcd2e48634bf39b9cd4a85af29cb1)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e492818d8925d63548c859ae560cadc852b4d297
---

 libavcodec/libopencore-amr.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
index ad6d338..8afc927 100644
--- a/libavcodec/libopencore-amr.c
+++ b/libavcodec/libopencore-amr.c
@@ -61,6 +61,7 @@ typedef struct AMRContext {
     AudioFrameQueue afq;
 } AMRContext;
 
+#if CONFIG_LIBOPENCORE_AMRNB_DECODER
 static av_cold int amr_nb_decode_init(AVCodecContext *avctx)
 {
     AMRContext *s  = avctx->priv_data;
@@ -141,7 +142,9 @@ AVCodec ff_libopencore_amrnb_decoder = {
     .capabilities   = CODEC_CAP_DR1,
     .long_name      = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"),
 };
+#endif /* CONFIG_LIBOPENCORE_AMRNB_DECODER */
 
+#if CONFIG_LIBOPENCORE_AMRNB_ENCODER
 /* Common code for fixed and float version*/
 typedef struct AMR_bitrates {
     int       rate;
@@ -305,8 +308,9 @@ AVCodec ff_libopencore_amrnb_encoder = {
     .long_name      = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"),
     .priv_class     = &class,
 };
+#endif /* CONFIG_LIBOPENCORE_AMRNB_ENCODER */
 
-#endif
+#endif /* CONFIG_LIBOPENCORE_AMRNB */
 
 /* -----------AMR wideband ------------*/
 #if CONFIG_LIBOPENCORE_AMRWB



More information about the ffmpeg-cvslog mailing list