[SCM] libav/experimental: Blackfin: use SRAM only when CONFIG_SRAM is set

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:59:07 UTC 2013


The following commit has been merged in the experimental branch:
commit e62bd367ea56526985e0e618c393cf2a28f157ff
Author: Måns Rullgård <mans at mansr.com>
Date:   Sun Jan 31 00:20:37 2010 +0000

    Blackfin: use SRAM only when CONFIG_SRAM is set
    
    Originally committed as revision 30472 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/bfin/internal_bfin.S b/libswscale/bfin/internal_bfin.S
index fb7bda7..98f69ef 100644
--- a/libswscale/bfin/internal_bfin.S
+++ b/libswscale/bfin/internal_bfin.S
@@ -94,7 +94,7 @@ to do with the memory system.
 */
 
 #define mL3 .text
-#ifdef __FDPIC__
+#if defined(__FDPIC__) && CONFIG_SRAM
 #define mL1 .l1.text
 #else
 #define mL1 mL3
diff --git a/libswscale/bfin/swscale_bfin.c b/libswscale/bfin/swscale_bfin.c
index 2ad81d8..ce2f172 100644
--- a/libswscale/bfin/swscale_bfin.c
+++ b/libswscale/bfin/swscale_bfin.c
@@ -31,7 +31,7 @@
 #include "libswscale/swscale.h"
 #include "libswscale/swscale_internal.h"
 
-#ifdef __FDPIC__
+#if defined (__FDPIC__) && CONFIG_SRAM
 #define L1CODE __attribute__ ((l1_text))
 #else
 #define L1CODE
diff --git a/libswscale/bfin/yuv2rgb_bfin.c b/libswscale/bfin/yuv2rgb_bfin.c
index 39e1ec8..eaa83ea 100644
--- a/libswscale/bfin/yuv2rgb_bfin.c
+++ b/libswscale/bfin/yuv2rgb_bfin.c
@@ -32,7 +32,7 @@
 #include "libswscale/swscale.h"
 #include "libswscale/swscale_internal.h"
 
-#ifdef __FDPIC__
+#if defined(__FDPIC__) && CONFIG_SRAM
 #define L1CODE __attribute__ ((l1_text))
 #else
 #define L1CODE

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list