summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-05-15 17:22:41 +0000
committerDiego Biurrun <diego@biurrun.de>2009-05-15 17:22:41 +0000
commit4d7d5ede5d78260507973ef45e1042e249cac911 (patch)
tree6a68bc1f2a3bc33a01c6f747790abe781e5f1c13
parentd2dfde0811515e58cf14f826d01e38fa04b6d148 (diff)
Remove redundant #if condition. Two CONFIG_LIBAMR_NB blocks were right after
each other so that the second check was pointless. Originally committed as revision 18844 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/libamr.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/libamr.c b/libavcodec/libamr.c
index 34f4962611..11144713c5 100644
--- a/libavcodec/libamr.c
+++ b/libavcodec/libamr.c
@@ -255,10 +255,6 @@ static int amr_nb_encode_frame(AVCodecContext *avctx,
return written;
}
-#endif
-
-#if CONFIG_LIBAMR_NB
-
AVCodec libamr_nb_decoder =
{
"libamr_nb",