diff options
| author | Michel Bardiaux <mbardiaux@peaktime.be> | 2005-09-24 17:42:56 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2005-09-24 17:42:56 +0000 |
| commit | 399d84012fec13529e191b6f9d659b977ebfd035 (patch) | |
| tree | 525b66ea0f3169e5078053c5f4db66400347b70a /libavcodec/amr.c | |
| parent | 67860b268ee2517a2d3e8465ff50f56def88ded9 (diff) | |
| download | ffmpeg-399d84012fec13529e191b6f9d659b977ebfd035.tar.gz | |
Fix some #ifdef to allow building amr_wb alone.
patch by Michel Bardiaux < mbardiaux -- dot -- mediaxim -- dot -- be >
Originally committed as revision 4615 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/amr.c')
| -rw-r--r-- | libavcodec/amr.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/amr.c b/libavcodec/amr.c index 8b48ff0061..fccb69d009 100644 --- a/libavcodec/amr.c +++ b/libavcodec/amr.c @@ -326,7 +326,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, } -#else /* Float point version*/ +#elif defined(AMR_NB) /* Float point version*/ typedef struct AMRContext { int frameCount; @@ -457,6 +457,8 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, #endif +#if defined(AMR_NB) || defined(AMR_NB_FIXED) + AVCodec amr_nb_decoder = { "amr_nb", @@ -481,6 +483,8 @@ AVCodec amr_nb_encoder = NULL, }; +#endif + /* -----------AMR wideband ------------*/ #ifdef AMR_WB |