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
74 lines
4.0 KiB
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
|
|
#
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
# Please add additional copyright information _after_ the line containing
|
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
|
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
|
|
#
|
|
# ROCK Linux: rock-src/package/rene/transcode/gcc34.patch
|
|
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
|
|
#
|
|
# This patch file is dual-licensed. It is available under the license the
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
# of the GNU General Public License as published by the Free Software
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
# version.
|
|
#
|
|
# --- ROCK-COPYRIGHT-NOTE-END ---
|
|
|
|
diff -dur transcode-0.6.12/ffmpeg/libavcodec/i386/dsputil_mmx.c transcode-0.6.12-patch/ffmpeg/libavcodec/i386/dsputil_mmx.c
|
|
--- transcode-0.6.12/ffmpeg/libavcodec/i386/dsputil_mmx.c 2003-12-30 11:02:10.000000000 +0100
|
|
+++ transcode-0.6.12-patch/ffmpeg/libavcodec/i386/dsputil_mmx.c 2004-08-05 00:32:57.000000000 +0200
|
|
@@ -31,8 +31,8 @@
|
|
static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
|
|
static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
|
|
|
|
-static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
|
|
-static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
|
|
+static const uint64_t ff_pw_20 __attribute__ ((used)) __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
|
|
+static const uint64_t ff_pw_3 __attribute__ ((used)) __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
|
|
static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
|
|
static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
|
|
|
|
Nur in transcode-0.6.12-patch/ffmpeg/libavcodec/i386: dsputil_mmx.c~.
|
|
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
|
|
--- transcode-0.6.12/ffmpeg/libavcodec/i386/motion_est_mmx.c 2003-12-30 11:02:10.000000000 +0100
|
|
+++ transcode-0.6.12-patch/ffmpeg/libavcodec/i386/motion_est_mmx.c 2004-08-05 00:32:57.000000000 +0200
|
|
@@ -26,7 +26,7 @@
|
|
0x0002000200020002ULL,
|
|
};
|
|
|
|
-static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
|
|
+static __attribute__ ((used)) __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
|
|
|
|
static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
|
|
{
|
|
Nur in transcode-0.6.12-patch/ffmpeg/libavcodec/i386: motion_est_mmx.c~.
|
|
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
|
|
--- transcode-0.6.12/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2003-12-20 12:49:12.000000000 +0100
|
|
+++ transcode-0.6.12-patch/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2004-08-05 00:32:57.000000000 +0200
|
|
@@ -45,8 +45,8 @@
|
|
#define ROW_SHIFT 11
|
|
#define COL_SHIFT 20 // 6
|
|
|
|
-static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
|
|
-static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
|
|
+static const uint64_t __attribute__ ((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
|
|
+static const uint64_t __attribute__ ((used)) __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
|
|
|
|
static const int16_t __attribute__((aligned(8))) coeffs[]= {
|
|
1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
|
|
diff -dur transcode-0.6.12/filter/subtitler/frame_list.c transcode-0.6.12-patch/filter/subtitler/frame_list.c
|
|
--- transcode-0.6.12/filter/subtitler/frame_list.c 2004-01-05 14:12:55.000000000 +0100
|
|
+++ transcode-0.6.12-patch/filter/subtitler/frame_list.c 2004-08-05 00:59:05.000000000 +0200
|
|
@@ -33,7 +33,7 @@
|
|
|
|
char *strsave(char *s) /*save char array s somewhere*/
|
|
{
|
|
-char *p, *malloc();
|
|
+char *p;
|
|
if(p = malloc( strlen(s) + 1) ) strcpy(p, s);
|
|
return(p);
|
|
}
|
|
Nur in transcode-0.6.12-patch/filter/subtitler: frame_list.c~.
|