boxee-source/ffmpeg64.patch

   1 --- xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dsputil_mmx.h.orig        2010-02-17 22:37:17.000000000 -0800
   2 +++ xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dsputil_mmx.h     2010-02-17 22:41:27.000000000 -0800
   3 @@ -27,37 +27,37 @@
   4
   5  typedef struct { uint64_t a, b; } xmm_reg;
   6
   7 -extern const uint64_t ff_bone;
   8 -extern const uint64_t ff_wtwo;
   9 +extern const uint64_t __attribute__((visibility("hidden"))) ff_bone;
  10 +extern const uint64_t __attribute__((visibility("hidden"))) ff_wtwo;
  11
  12 -extern const uint64_t ff_pdw_80000000[2];
  13 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pdw_80000000[2];
  14
  15 -extern const uint64_t ff_pw_3;
  16 -extern const uint64_t ff_pw_4;
  17 -extern const xmm_reg  ff_pw_5;
  18 -extern const xmm_reg  ff_pw_8;
  19 -extern const uint64_t ff_pw_15;
  20 -extern const xmm_reg  ff_pw_16;
  21 -extern const uint64_t ff_pw_20;
  22 -extern const xmm_reg  ff_pw_28;
  23 -extern const xmm_reg  ff_pw_32;
  24 -extern const uint64_t ff_pw_42;
  25 -extern const xmm_reg  ff_pw_64;
  26 -extern const uint64_t ff_pw_96;
  27 -extern const uint64_t ff_pw_128;
  28 -extern const uint64_t ff_pw_255;
  29 -
  30 -extern const uint64_t ff_pb_1;
  31 -extern const uint64_t ff_pb_3;
  32 -extern const uint64_t ff_pb_7;
  33 -extern const uint64_t ff_pb_1F;
  34 -extern const uint64_t ff_pb_3F;
  35 -extern const uint64_t ff_pb_81;
  36 -extern const uint64_t ff_pb_A1;
  37 -extern const uint64_t ff_pb_FC;
  38 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pw_3;
  39 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pw_4;
  40 +extern const xmm_reg  __attribute__((visibility("hidden"))) ff_pw_5;
  41 +extern const xmm_reg  __attribute__((visibility("hidden"))) ff_pw_8;
  42 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pw_15;
  43 +extern const xmm_reg  __attribute__((visibility("hidden"))) ff_pw_16;
  44 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pw_20;
  45 +extern const xmm_reg  __attribute__((visibility("hidden"))) ff_pw_28;
  46 +extern const xmm_reg  __attribute__((visibility("hidden"))) ff_pw_32;
  47 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pw_42;
  48 +extern const xmm_reg  __attribute__((visibility("hidden"))) ff_pw_64;
  49 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pw_96;
  50 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pw_128;
  51 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pw_255;
  52 +
  53 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pb_1;
  54 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pb_3;
  55 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pb_7;
  56 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pb_1F;
  57 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pb_3F;
  58 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pb_81;
  59 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pb_A1;
  60 +extern const uint64_t __attribute__((visibility("hidden"))) ff_pb_FC;
  61
  62 -extern const double ff_pd_1[2];
  63 -extern const double ff_pd_2[2];
  64 +extern const double __attribute__((visibility("hidden"))) ff_pd_1[2];
  65 +extern const double __attribute__((visibility("hidden"))) ff_pd_2[2];
  66
  67  #define LOAD4(stride,in,a,b,c,d)\
  68      "movq 0*"#stride"+"#in", "#a"\n\t"\
  69 --- xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/vc1dsp_mmx.c.orig 2010-02-17 22:44:34.000000000 -0800
  70 +++ xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/vc1dsp_mmx.c      2010-02-17 22:45:31.000000000 -0800
  71 @@ -73,7 +73,10 @@
  72      "movq      %%mm"#R1", "#OFF"(%1)   \n\t"    \
  73      "add       %2, %0                  \n\t"
  74
  75 -DECLARE_ALIGNED_16(const uint64_t, ff_pw_9) = 0x0009000900090009ULL;
  76 +#ifndef _ATTR_HIDDEN
  77 +#define _ATTR_HIDDEN __attribute__((visibility("hidden")))
  78 +#endif
  79 +DECLARE_ALIGNED_16(const uint64_t, _ATTR_HIDDEN ff_pw_9) = 0x0009000900090009ULL;
  80
  81  /** Sacrifying mm6 allows to pipeline loads from src */
  82  static void vc1_put_ver_16b_shift2_mmx(int16_t *dst,
  83 --- xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale.c.orig        2010-02-17 22:51:41.000000000 -0800
  84 +++ xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale.c     2010-02-17 22:56:00.000000000 -0800
  85 @@ -221,6 +221,10 @@
  86  write special BGR->BGR scaler
  87  */
  88
  89 +#ifndef _ATTR_HIDDEN
  90 +#define _ATTR_HIDDEN __attribute__((visibility("hidden")))
  91 +#endif
  92 +
  93  #if ARCH_X86 && CONFIG_GPL
  94  DECLARE_ASM_CONST(8, uint64_t, bF8)=       0xF8F8F8F8F8F8F8F8LL;
  95  DECLARE_ASM_CONST(8, uint64_t, bFC)=       0xFCFCFCFCFCFCFCFCLL;
  96 @@ -246,22 +250,22 @@
  97  DECLARE_ASM_CONST(8, uint64_t, g15Mask)=   0x03E003E003E003E0LL;
  98  DECLARE_ASM_CONST(8, uint64_t, r15Mask)=   0x7C007C007C007C00LL;
  99
 100 -DECLARE_ALIGNED(8, const uint64_t, ff_M24A)         = 0x00FF0000FF0000FFLL;
 101 -DECLARE_ALIGNED(8, const uint64_t, ff_M24B)         = 0xFF0000FF0000FF00LL;
 102 -DECLARE_ALIGNED(8, const uint64_t, ff_M24C)         = 0x0000FF0000FF0000LL;
 103 +DECLARE_ALIGNED(8, const uint64_t, _ATTR_HIDDEN ff_M24A)         = 0x00FF0000FF0000FFLL;
 104 +DECLARE_ALIGNED(8, const uint64_t, _ATTR_HIDDEN ff_M24B)         = 0xFF0000FF0000FF00LL;
 105 +DECLARE_ALIGNED(8, const uint64_t, _ATTR_HIDDEN ff_M24C)         = 0x0000FF0000FF0000LL;
 106
 107  #ifdef FAST_BGR2YV12
 108 -DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YCoeff)   = 0x000000210041000DULL;
 109 -DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UCoeff)   = 0x0000FFEEFFDC0038ULL;
 110 -DECLARE_ALIGNED(8, const uint64_t, ff_bgr2VCoeff)   = 0x00000038FFD2FFF8ULL;
 111 +DECLARE_ALIGNED(8, const uint64_t, _ATTR_HIDDEN ff_bgr2YCoeff)   = 0x000000210041000DULL;
 112 +DECLARE_ALIGNED(8, const uint64_t, _ATTR_HIDDEN ff_bgr2UCoeff)   = 0x0000FFEEFFDC0038ULL;
 113 +DECLARE_ALIGNED(8, const uint64_t, _ATTR_HIDDEN ff_bgr2VCoeff)   = 0x00000038FFD2FFF8ULL;
 114  #else
 115 -DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YCoeff)   = 0x000020E540830C8BULL;
 116 -DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UCoeff)   = 0x0000ED0FDAC23831ULL;
 117 -DECLARE_ALIGNED(8, const uint64_t, ff_bgr2VCoeff)   = 0x00003831D0E6F6EAULL;
 118 +DECLARE_ALIGNED(8, const uint64_t, _ATTR_HIDDEN ff_bgr2YCoeff)   = 0x000020E540830C8BULL;
 119 +DECLARE_ALIGNED(8, const uint64_t, _ATTR_HIDDEN ff_bgr2UCoeff)   = 0x0000ED0FDAC23831ULL;
 120 +DECLARE_ALIGNED(8, const uint64_t, _ATTR_HIDDEN ff_bgr2VCoeff)   = 0x00003831D0E6F6EAULL;
 121  #endif /* FAST_BGR2YV12 */
 122 -DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YOffset)  = 0x1010101010101010ULL;
 123 -DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UVOffset) = 0x8080808080808080ULL;
 124 -DECLARE_ALIGNED(8, const uint64_t, ff_w1111)        = 0x0001000100010001ULL;
 125 +DECLARE_ALIGNED(8, const uint64_t, _ATTR_HIDDEN ff_bgr2YOffset)  = 0x1010101010101010ULL;
 126 +DECLARE_ALIGNED(8, const uint64_t, _ATTR_HIDDEN ff_bgr2UVOffset) = 0x8080808080808080ULL;
 127 +DECLARE_ALIGNED(8, const uint64_t, _ATTR_HIDDEN ff_w1111)        = 0x0001000100010001ULL;
 128
 129  DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toY1Coeff) = 0x0C88000040870C88ULL;
 130  DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toY2Coeff) = 0x20DE4087000020DEULL;