[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec allcodecs.c,1.136,1.137

[Diego Biurrun CVS]

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

Modified Files:
	allcodecs.c 
Log Message:
Enable AMR_NB decoder/encoder when either AMR_NB or AMR_NB_FIXED is defined.


Index: allcodecs.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/allcodecs.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- allcodecs.c	15 Apr 2006 14:15:09 -0000	1.136
+++ allcodecs.c	27 Apr 2006 11:49:15 -0000	1.137
@@ -531,7 +531,7 @@
 #endif //CONFIG_RAWVIDEO_DECODER
 #endif /* CONFIG_DECODERS */
 
-#ifdef AMR_NB
+#if defined(AMR_NB) || defined(AMR_NB_FIXED)
 #ifdef CONFIG_AMR_NB_DECODER
     register_avcodec(&amr_nb_decoder);
 #endif //CONFIG_AMR_NB_DECODER
@@ -540,7 +540,7 @@
     register_avcodec(&amr_nb_encoder);
 #endif //CONFIG_AMR_NB_ENCODER
 #endif //CONFIG_ENCODERS
-#endif /* AMR_NB */
+#endif /* AMR_NB || AMR_NB_FIXED */
 
 #ifdef AMR_WB
 #ifdef CONFIG_AMR_WB_DECODER