[SCM] libav/experimental: Surround AMR_WB encoding code by appropriate #ifdefs. This will help support the opencore AMR library.

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


The following commit has been merged in the experimental branch:
commit e09989be4547c8178cd0c174c20c44e919e94a5d
Author: Diego Biurrun <diego at biurrun.de>
Date:   Fri May 15 19:03:45 2009 +0000

    Surround AMR_WB encoding code by appropriate #ifdefs.
    This will help support the opencore AMR library.
    
    Originally committed as revision 18847 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/libamr.c b/libavcodec/libamr.c
index a13facb..98fcc2d 100644
--- a/libavcodec/libamr.c
+++ b/libavcodec/libamr.c
@@ -309,6 +309,8 @@ typedef struct AMRWBContext {
     Word16 allow_dtx;
 } AMRWBContext;
 
+#if CONFIG_LIBAMR_WB_ENCODER
+
 #include <amrwb/enc_if.h>
 
 static int getWBBitrateMode(int bitrate)
@@ -409,6 +411,8 @@ AVCodec libamr_wb_encoder =
     .long_name = NULL_IF_CONFIG_SMALL("libamr-wb Adaptive Multi-Rate (AMR) Wide-Band"),
 };
 
+#endif
+
 static av_cold int amr_wb_decode_init(AVCodecContext * avctx)
 {
     AMRWBContext *s = avctx->priv_data;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list