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.

74 lines
4.0 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/rene/transcode/gcc34.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. diff -dur transcode-0.6.12/ffmpeg/libavcodec/i386/dsputil_mmx.c transcode-0.6.12-patch/ffmpeg/libavcodec/i386/dsputil_mmx.c
  20. --- transcode-0.6.12/ffmpeg/libavcodec/i386/dsputil_mmx.c 2003-12-30 11:02:10.000000000 +0100
  21. +++ transcode-0.6.12-patch/ffmpeg/libavcodec/i386/dsputil_mmx.c 2004-08-05 00:32:57.000000000 +0200
  22. @@ -31,8 +31,8 @@
  23. static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
  24. static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
  25. -static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
  26. -static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
  27. +static const uint64_t ff_pw_20 __attribute__ ((used)) __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
  28. +static const uint64_t ff_pw_3 __attribute__ ((used)) __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
  29. static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
  30. static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
  31. Nur in transcode-0.6.12-patch/ffmpeg/libavcodec/i386: dsputil_mmx.c~.
  32. diff -dur transcode-0.6.12/ffmpeg/libavcodec/i386/motion_est_mmx.c transcode-0.6.12-patch/ffmpeg/libavcodec/i386/motion_est_mmx.c
  33. --- transcode-0.6.12/ffmpeg/libavcodec/i386/motion_est_mmx.c 2003-12-30 11:02:10.000000000 +0100
  34. +++ transcode-0.6.12-patch/ffmpeg/libavcodec/i386/motion_est_mmx.c 2004-08-05 00:32:57.000000000 +0200
  35. @@ -26,7 +26,7 @@
  36. 0x0002000200020002ULL,
  37. };
  38. -static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
  39. +static __attribute__ ((used)) __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
  40. static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
  41. {
  42. Nur in transcode-0.6.12-patch/ffmpeg/libavcodec/i386: motion_est_mmx.c~.
  43. diff -dur transcode-0.6.12/ffmpeg/libavcodec/i386/simple_idct_mmx.c transcode-0.6.12-patch/ffmpeg/libavcodec/i386/simple_idct_mmx.c
  44. --- transcode-0.6.12/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2003-12-20 12:49:12.000000000 +0100
  45. +++ transcode-0.6.12-patch/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2004-08-05 00:32:57.000000000 +0200
  46. @@ -45,8 +45,8 @@
  47. #define ROW_SHIFT 11
  48. #define COL_SHIFT 20 // 6
  49. -static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
  50. -static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
  51. +static const uint64_t __attribute__ ((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
  52. +static const uint64_t __attribute__ ((used)) __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
  53. static const int16_t __attribute__((aligned(8))) coeffs[]= {
  54. 1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
  55. diff -dur transcode-0.6.12/filter/subtitler/frame_list.c transcode-0.6.12-patch/filter/subtitler/frame_list.c
  56. --- transcode-0.6.12/filter/subtitler/frame_list.c 2004-01-05 14:12:55.000000000 +0100
  57. +++ transcode-0.6.12-patch/filter/subtitler/frame_list.c 2004-08-05 00:59:05.000000000 +0200
  58. @@ -33,7 +33,7 @@
  59. char *strsave(char *s) /*save char array s somewhere*/
  60. {
  61. -char *p, *malloc();
  62. +char *p;
  63. if(p = malloc( strlen(s) + 1) ) strcpy(p, s);
  64. return(p);
  65. }
  66. Nur in transcode-0.6.12-patch/filter/subtitler: frame_list.c~.