OpenSDE
/
rocklinux
mirror of https://github.com/amery/rocklinux.git
2
0
Fork 0
Code Releases Wiki Activity
mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
2423 Commits
1 Branch
0 Tags
34 MiB
Tree: 9aa3ae4af1
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '9aa3ae4af1'
${ noResults }
rocklinux/package/rene/ffmpeg/gcc34.patch

81 lines
4.9 KiB
Raw Normal View History

Stefan Fiedler: patch ffmpeg to compile with gcc 3.4 [2004061616502315293] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3366 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
20 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. add the attribute used to some variables, so gcc 3.4 does not remove them;
  2. gcc 3.2.3 ignores the attribute.
  4. diff -dur ffmpeg-0.4.8/libavcodec/i386/dsputil_mmx.c ffmpeg-0.4.8-patch/libavcodec/i386/dsputil_mmx.c
  5. --- ffmpeg-0.4.8/libavcodec/i386/dsputil_mmx.c 2003-09-28 17:26:40.000000000 +0200
  6. +++ ffmpeg-0.4.8-patch/libavcodec/i386/dsputil_mmx.c 2004-06-14 17:17:20.000000000 +0200
  7. @@ -29,8 +29,8 @@
  8. static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
  9. static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
  11. -static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
  12. -static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
  13. +static const uint64_t ff_pw_20 __attribute__ ((used)) __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
  14. +static const uint64_t ff_pw_3 __attribute__ ((used)) __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
  15. static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
  16. static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
  18. Nur in ffmpeg-0.4.8-patch/libavcodec/i386: dsputil_mmx.c~.
  19. diff -dur ffmpeg-0.4.8/libavcodec/i386/motion_est_mmx.c ffmpeg-0.4.8-patch/libavcodec/i386/motion_est_mmx.c
  20. --- ffmpeg-0.4.8/libavcodec/i386/motion_est_mmx.c 2003-09-28 17:26:40.000000000 +0200
  21. +++ ffmpeg-0.4.8-patch/libavcodec/i386/motion_est_mmx.c 2004-06-14 17:13:55.000000000 +0200
  22. @@ -26,7 +26,7 @@
  23. 0x0002000200020002,
  24. };
  26. -static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
  27. +static __attribute__ ((used)) __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
  29. static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
  30. {
  31. Nur in ffmpeg-0.4.8-patch/libavcodec/i386: motion_est_mmx.c~.
  32. diff -dur ffmpeg-0.4.8/libavcodec/i386/simple_idct_mmx.c ffmpeg-0.4.8-patch/libavcodec/i386/simple_idct_mmx.c
  33. --- ffmpeg-0.4.8/libavcodec/i386/simple_idct_mmx.c 2003-09-28 17:26:40.000000000 +0200
  34. +++ ffmpeg-0.4.8-patch/libavcodec/i386/simple_idct_mmx.c 2004-06-14 17:17:47.000000000 +0200
  35. @@ -45,8 +45,8 @@
  36. #define ROW_SHIFT 11
  37. #define COL_SHIFT 20 // 6
  39. -static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
  40. -static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
  41. +static const uint64_t __attribute__ ((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
  42. +static const uint64_t __attribute__ ((used)) __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
  44. static const int16_t __attribute__((aligned(8))) coeffs[]= {
  45. 1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
  46. Nur in ffmpeg-0.4.8-patch/libavcodec/i386: simple_idct_mmx.c~.
  47. diff -dur ffmpeg-0.4.8/libavcodec/liba52/resample_mmx.c ffmpeg-0.4.8-patch/libavcodec/liba52/resample_mmx.c
  48. --- ffmpeg-0.4.8/libavcodec/liba52/resample_mmx.c 2003-09-28 17:26:40.000000000 +0200
  49. +++ ffmpeg-0.4.8-patch/libavcodec/liba52/resample_mmx.c 2004-06-14 16:53:43.000000000 +0200
  50. @@ -7,10 +7,11 @@
  51. and it would mean (C / MMX2 / MMX / 3DNOW) versions
  52. */
  54. -static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
  55. -static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
  56. -static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
  57. -static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
  58. +static uint64_t __attribute__((used)) __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
  59. +static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
  60. +static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
  61. +static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
  62. +
  64. static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
  65. int32_t * f = (int32_t *) _f;
  66. Nur in ffmpeg-0.4.8-patch/libavcodec/liba52: resample_mmx.c~.
  67. diff -dur ffmpeg-0.4.8/libavcodec/libpostproc/postprocess.c ffmpeg-0.4.8-patch/libavcodec/libpostproc/postprocess.c
  68. --- ffmpeg-0.4.8/libavcodec/libpostproc/postprocess.c 2003-09-28 17:26:40.000000000 +0200
  69. +++ ffmpeg-0.4.8-patch/libavcodec/libpostproc/postprocess.c 2004-06-14 17:15:07.000000000 +0200
  70. @@ -104,8 +104,8 @@
  71. //#define NUM_BLOCKS_AT_ONCE 16 //not used yet
  73. #ifdef ARCH_X86
  74. -static uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL;
  75. -static uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL;
  76. +static uint64_t __attribute__ ((used)) __attribute__((aligned(8))) w05= 0x0005000500050005LL;
  77. +static uint64_t __attribute__ ((used)) __attribute__((aligned(8))) w20= 0x0020002000200020LL;
  78. static uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL;
  79. static uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL;
  80. static uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL;
  81. Nur in ffmpeg-0.4.8-patch/libavcodec/libpostproc: postprocess.c~.