Commit 399d8401 authored by Michel Bardiaux's avatar Michel Bardiaux Committed by Diego Biurrun

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
parent 67860b26
...@@ -326,7 +326,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, ...@@ -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 { typedef struct AMRContext {
int frameCount; int frameCount;
...@@ -457,6 +457,8 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, ...@@ -457,6 +457,8 @@ static int amr_nb_encode_frame(AVCodecContext *avctx,
#endif #endif
#if defined(AMR_NB) || defined(AMR_NB_FIXED)
AVCodec amr_nb_decoder = AVCodec amr_nb_decoder =
{ {
"amr_nb", "amr_nb",
...@@ -481,6 +483,8 @@ AVCodec amr_nb_encoder = ...@@ -481,6 +483,8 @@ AVCodec amr_nb_encoder =
NULL, NULL,
}; };
#endif
/* -----------AMR wideband ------------*/ /* -----------AMR wideband ------------*/
#ifdef AMR_WB #ifdef AMR_WB
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment