aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-02-16 23:05:03 +0100
committerLuca Barbato <lu_zero@gentoo.org>2013-02-16 23:41:31 +0100
commite492818d8925d63548c859ae560cadc852b4d297 (patch)
treeb4d61b69774e0f15beefcbb6ae8817156ea6f533
parent1ca25bc387756677e9ce23163995aade2e5b663f (diff)
downloadffmpeg-e492818d8925d63548c859ae560cadc852b4d297.tar.gz
libopencore-amr: Conditionally compile decoder and encoder bits
CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit f6ad3ca159edcd2e48634bf39b9cd4a85af29cb1)
-rw-r--r--libavcodec/libopencore-amr.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
index ad6d338fd9..8afc927784 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