[SCM] opencore-amr packaging branch, master, updated. upstream/0.1.2-10-g7bf1e45

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 965f459afb85e0b63272a80af448a1045b9118e3
Author: Martin Storsjo <martin at martin.st>
Date:   Sun Jun 7 21:41:23 2009 -0700

    Remove patches that are no longer needed separately

diff --git a/patches/01-c-compilation.patch b/patches/01-c-compilation.patch
deleted file mode 100644
index 49e1693..0000000
--- a/patches/01-c-compilation.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/codecs_v2/audio/gsm_amr/amr_wb/dec/include/pvamrwbdecoder_api.h b/codecs_v2/audio/gsm_amr/amr_wb/dec/include/pvamrwbdecoder_api.h
-index 0ba8663..3b8578d 100644
---- a/codecs_v2/audio/gsm_amr/amr_wb/dec/include/pvamrwbdecoder_api.h
-+++ b/codecs_v2/audio/gsm_amr/amr_wb/dec/include/pvamrwbdecoder_api.h
-@@ -108,7 +108,7 @@ extern "C"
- #define NUM_OF_MODES  10
- 
- 
--    const int16 AMR_WB_COMPRESSED[NUM_OF_MODES] =
-+    static const int16 AMR_WB_COMPRESSED[NUM_OF_MODES] =
-     {
-         NBBITS_7k,
-         NBBITS_9k,
-diff --git a/codecs_v2/audio/gsm_amr/amr_wb/dec/src/oversamp_12k8_to_16k.cpp b/codecs_v2/audio/gsm_amr/amr_wb/dec/src/oversamp_12k8_to_16k.cpp
-index 43aaef7..6f01ba5 100644
---- a/codecs_v2/audio/gsm_amr/amr_wb/dec/src/oversamp_12k8_to_16k.cpp
-+++ b/codecs_v2/audio/gsm_amr/amr_wb/dec/src/oversamp_12k8_to_16k.cpp
-@@ -337,6 +337,6 @@ int16 AmrWbInterpol(                      /* return result of interpolation */
- 
-     L_sum = shl_int32(L_sum, 2);               /* saturation can occur here */
- 
--    return ((int16(L_sum >> 16)));
-+    return ((int16)(L_sum >> 16));
- }
- 
-diff --git a/codecs_v2/audio/gsm_amr/common/dec/include/pvgsmamrdecoderinterface.h b/codecs_v2/audio/gsm_amr/common/dec/include/pvgsmamrdecoderinterface.h
-index 59a2f73..a21f2ef 100644
---- a/codecs_v2/audio/gsm_amr/common/dec/include/pvgsmamrdecoderinterface.h
-+++ b/codecs_v2/audio/gsm_amr/common/dec/include/pvgsmamrdecoderinterface.h
-@@ -181,6 +181,7 @@ typedef struct tPVAmrDecoderExternal
- 
- } tPVAmrDecoderExternal;
- 
-+#ifdef __cplusplus
- // CDecoder_AMRInterface
- class CDecoder_AMRInterface
- {
-@@ -195,6 +196,7 @@ class CDecoder_AMRInterface
-         OSCL_IMPORT_REF virtual void StopL() = 0;
-         OSCL_IMPORT_REF virtual void TerminateDecoderL() = 0;
- };
-+#endif
- 
- 
- 
diff --git a/patches/02-duplicate-symbols.patch b/patches/02-duplicate-symbols.patch
deleted file mode 100644
index b9565e4..0000000
--- a/patches/02-duplicate-symbols.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/codecs_v2/audio/gsm_amr/amr_wb/dec/src/homing_amr_wb_dec.cpp b/codecs_v2/audio/gsm_amr/amr_wb/dec/src/homing_amr_wb_dec.cpp
-index 59c6c0a..9b4a870 100644
---- a/codecs_v2/audio/gsm_amr/amr_wb/dec/src/homing_amr_wb_dec.cpp
-+++ b/codecs_v2/audio/gsm_amr/amr_wb/dec/src/homing_amr_wb_dec.cpp
-@@ -134,7 +134,7 @@ extern "C"
- ; LOCAL STORE/BUFFER/POINTER DEFINITIONS
- ; Variable declaration - defined here and used outside this module
- ----------------------------------------------------------------------------*/
--const int16 prmnofsf[NUM_OF_SPMODES] =
-+static const int16 prmnofsf[NUM_OF_SPMODES] =
- {
-     63,  81, 100,
-     108, 116, 128,
-diff --git a/codecs_v2/audio/gsm_amr/amr_wb/dec/src/isp_isf.cpp b/codecs_v2/audio/gsm_amr/amr_wb/dec/src/isp_isf.cpp
-index 41db7e3..0552733 100644
---- a/codecs_v2/audio/gsm_amr/amr_wb/dec/src/isp_isf.cpp
-+++ b/codecs_v2/audio/gsm_amr/amr_wb/dec/src/isp_isf.cpp
-@@ -108,7 +108,7 @@ terms listed above has been obtained from the copyright holder.
- 
- /* table of cos(x) in Q15 */
- 
--const int16 table[129] =
-+static const int16 table[129] =
- {
-     32767,
-     32758,  32729,  32679,  32610,  32522,  32413,  32286,  32138,
-diff --git a/codecs_v2/audio/gsm_amr/amr_wb/dec/src/phase_dispersion.cpp b/codecs_v2/audio/gsm_amr/amr_wb/dec/src/phase_dispersion.cpp
-index f90a534..7b08a40 100644
---- a/codecs_v2/audio/gsm_amr/amr_wb/dec/src/phase_dispersion.cpp
-+++ b/codecs_v2/audio/gsm_amr/amr_wb/dec/src/phase_dispersion.cpp
-@@ -109,7 +109,7 @@ terms listed above has been obtained from the copyright holder.
- /* impulse response with phase dispersion */
- 
- /* 2.0 - 6.4 kHz phase dispersion */
--const int16 ph_imp_low[L_SUBFR] =
-+static const int16 ph_imp_low[L_SUBFR] =
- {
-     20182,  9693,  3270, -3437, 2864, -5240,  1589, -1357,
-     600,  3893, -1497,  -698, 1203, -5249,  1199,  5371,
-@@ -122,7 +122,7 @@ const int16 ph_imp_low[L_SUBFR] =
- };
- 
- /* 3.2 - 6.4 kHz phase dispersion */
--const int16 ph_imp_mid[L_SUBFR] =
-+static const int16 ph_imp_mid[L_SUBFR] =
- {
-     24098, 10460, -5263,  -763,  2048,  -927,  1753, -3323,
-     2212,   652, -2146,  2487, -3539,  4109, -2107,  -374,

-- 
opencore-amr packaging