From 0f4cc5dfdfc3e2a3806220664d423ddf84d6381e Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Wed, 17 Nov 2004 22:11:44 +0000 Subject: Commit message: - Fix build on recent versions of gcc [1] - Add support for jpeg-mmx [2] PR: 74045 [1] 69832 [2] Submitted by: maintainer [1] Approved by: adamw (mentor) --- .../files/patch-ffmpeg:libavcodec:i386:dsputil_mmx.c | 13 +++++++++++++ .../files/patch-ffmpeg:libavcodec:i386:motion_est_mmx.c | 12 ++++++++++++ .../files/patch-ffmpeg:libavcodec:i386:simple_idct_mmx.c | 15 +++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:dsputil_mmx.c create mode 100644 multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:motion_est_mmx.c create mode 100644 multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:simple_idct_mmx.c (limited to 'multimedia/transcode/files') diff --git a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:dsputil_mmx.c b/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:dsputil_mmx.c new file mode 100644 index 000000000000..4ad4f716a2e1 --- /dev/null +++ b/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:dsputil_mmx.c @@ -0,0 +1,13 @@ +--- ffmpeg/libavcodec/i386/dsputil_mmx.c.orig Wed Nov 17 17:30:15 2004 ++++ ffmpeg/libavcodec/i386/dsputil_mmx.c Wed Nov 17 17:30:33 2004 +@@ -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__ ((aligned(8), used)) = 0x0014001400140014ULL; ++static const uint64_t ff_pw_3 __attribute__ ((aligned(8), used)) = 0x0003000300030003ULL; + static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL; + static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL; + diff --git a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:motion_est_mmx.c b/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:motion_est_mmx.c new file mode 100644 index 000000000000..40309131718a --- /dev/null +++ b/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:motion_est_mmx.c @@ -0,0 +1,12 @@ +--- ffmpeg/libavcodec/i386/motion_est_mmx.c.orig Wed Nov 17 17:31:38 2004 ++++ ffmpeg/libavcodec/i386/motion_est_mmx.c Wed Nov 17 17:31:47 2004 +@@ -26,7 +26,7 @@ + 0x0002000200020002ULL, + }; + +-static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL; ++static __attribute__ ((aligned(8), used)) uint64_t bone= 0x0101010101010101LL; + + static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h) + { + diff --git a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:simple_idct_mmx.c b/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:simple_idct_mmx.c new file mode 100644 index 000000000000..6001e63cec67 --- /dev/null +++ b/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:simple_idct_mmx.c @@ -0,0 +1,15 @@ +--- ffmpeg/libavcodec/i386/simple_idct_mmx.c.orig Wed Nov 17 17:32:21 2004 ++++ ffmpeg/libavcodec/i386/simple_idct_mmx.c Wed Nov 17 17:32:37 2004 +@@ -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__((aligned(8), used)) wm1010= 0xFFFF0000FFFF0000ULL; ++static const uint64_t __attribute__((aligned(8), used)) d40000= 0x0000000000040000ULL; + + static const int16_t __attribute__((aligned(8))) coeffs[]= { + 1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0, + + -- cgit v1.2.3