[SCM] libav/experimental: Remove redundant #if condition. Two CONFIG_LIBAMR_NB blocks were right after each other so that the second check was pointless.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:45:54 UTC 2013


The following commit has been merged in the experimental branch:
commit 4d7d5ede5d78260507973ef45e1042e249cac911
Author: Diego Biurrun <diego at biurrun.de>
Date:   Fri May 15 17:22:41 2009 +0000

    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

diff --git a/libavcodec/libamr.c b/libavcodec/libamr.c
index 34f4962..1114471 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",

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list