summaryrefslogtreecommitdiff
path: root/libavcodec/allcodecs.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-04-27 11:49:15 +0000
committerDiego Biurrun <diego@biurrun.de>2006-04-27 11:49:15 +0000
commitc4921874f5773dacd2478c508a303e25a7034a82 (patch)
treedf548038d1994e50516d4fbe1d6dd148df8a8987 /libavcodec/allcodecs.c
parent3ed410a6bd787eb46d5ba9e05e77167b561686da (diff)
Enable AMR_NB decoder/encoder when either AMR_NB or AMR_NB_FIXED is defined.
Originally committed as revision 5325 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/allcodecs.c')
-rw-r--r--libavcodec/allcodecs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index f2d752095e..27de3d06b4 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -531,7 +531,7 @@ void avcodec_register_all(void)
#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 @@ void avcodec_register_all(void)
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