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

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Fri Sep 18 20:49:07 UTC 2009


The following commit has been merged in the master branch:
commit 5b5a5c384349dde66f534957c8944a2aaac2d459
Author: Martin Storsjo <martin at martin.st>
Date:   Tue Sep 1 12:41:10 2009 +0300

    Make a global const array static, to fix compilation as C
    
    Reapply change 10017 in the upstream repo, that had been merged before,
    but overwritten and not properly merged by the latest code drop.

diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/include/pvamrwbdecoder_api.h b/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/include/pvamrwbdecoder_api.h
index 04d7fa6..24fa429 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/include/pvamrwbdecoder_api.h
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/include/pvamrwbdecoder_api.h
@@ -100,7 +100,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,

-- 
opencore-amr packaging



More information about the pkg-multimedia-commits mailing list