diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 12:15:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 12:15:12 +0100 |
| commit | ab213b5360e82fca707197f3224a85695645d81d (patch) | |
| tree | 1ea4264228a68158226bc07a7564ade5a172400b | |
| parent | 4ff0e63a015a5f88e514b924221c89b690565a2d (diff) | |
| parent | e6bda9a9fd86505927a2e095e495eae104860701 (diff) | |
| download | ffmpeg-ab213b5360e82fca707197f3224a85695645d81d.tar.gz | |
Merge commit 'e6bda9a9fd86505927a2e095e495eae104860701'
* commit 'e6bda9a9fd86505927a2e095e495eae104860701':
libopencore-amr: Conditionally compile decoder and encoder bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libopencore-amr.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index 9b95e3a56d..3b71a3b64b 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; @@ -138,7 +139,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; @@ -300,8 +303,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 |