RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'e6bda9a9fd86505927a2e095e495eae104860701' 

* commit 'e6bda9a9fd86505927a2e095e495eae104860701':
  libopencore-amr: Conditionally compile decoder and encoder bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-18 12:15:07 +01:00
parent 4ff0e63a01 e6bda9a9fd
commit ab213b5360
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/libopencore-amr.c
View File

@ -61,6 +61,7 @@ typedef struct AMRContext {
AudioFrameQueue afq; AudioFrameQueue afq;
} AMRContext; } AMRContext;
#if CONFIG_LIBOPENCORE_AMRNB_DECODER
static av_cold int amr_nb_decode_init(AVCodecContext *avctx) static av_cold int amr_nb_decode_init(AVCodecContext *avctx)
{ {
AMRContext *s = avctx->priv_data; AMRContext *s = avctx->priv_data;
@ -138,7 +139,9 @@ AVCodec ff_libopencore_amrnb_decoder = {
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), .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*/ /* Common code for fixed and float version*/
typedef struct AMR_bitrates { typedef struct AMR_bitrates {
int rate; 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)"), .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"),
.priv_class = &class, .priv_class = &class,
}; };
#endif /* CONFIG_LIBOPENCORE_AMRNB_ENCODER */
#endif #endif /* CONFIG_LIBOPENCORE_AMRNB */
/* -----------AMR wideband ------------*/ /* -----------AMR wideband ------------*/
#if CONFIG_LIBOPENCORE_AMRWB #if CONFIG_LIBOPENCORE_AMRWB