[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec amr.c,1.9,1.10

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv19418/libavcodec

Modified Files:
	amr.c 
Log Message:
Fix some #ifdef to allow building amr_wb alone.
patch by Michel Bardiaux < mbardiaux -- dot -- mediaxim -- dot -- be >


Index: amr.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/amr.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- amr.c	22 Mar 2005 18:28:15 -0000	1.9
+++ amr.c	24 Sep 2005 17:42:56 -0000	1.10
@@ -326,7 +326,7 @@
 }
 
 
-#else /* Float point version*/
+#elif defined(AMR_NB) /* Float point version*/
 
 typedef struct AMRContext {
     int frameCount;
@@ -457,6 +457,8 @@
 
 #endif
 
+#if defined(AMR_NB) || defined(AMR_NB_FIXED)
+
 AVCodec amr_nb_decoder =
 {
     "amr_nb",
@@ -481,6 +483,8 @@
     NULL,
 };
 
+#endif
+
 /* -----------AMR wideband ------------*/
 #ifdef AMR_WB