diff options
| -rw-r--r-- | .SRCINFO | 188 | ||||
| -rw-r--r-- | PKGBUILD | 137 | ||||
| -rw-r--r-- | ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 41 | ||||
| -rw-r--r-- | include-samba-4.0.patch | 12 | ||||
| -rw-r--r-- | revert-icl-fixes.patch | 66 |
5 files changed, 277 insertions, 167 deletions
@@ -1,68 +1,94 @@ pkgbase = mplayer-svn - pkgver = 37553 + pkgdesc = Media player for Linux + pkgver = 38184M pkgrel = 1 url = http://www.mplayerhq.hu/ arch = i686 arch = x86_64 license = GPL - makedepends = libxxf86dga + makedepends = xorgproto makedepends = libxxf86vm makedepends = libmad makedepends = libxinerama - makedepends = sdl - makedepends = lame - makedepends = libtheora - makedepends = xvidcore makedepends = libmng makedepends = libxss - makedepends = libgl + makedepends = smbclient makedepends = aalib makedepends = jack makedepends = libcaca makedepends = faac makedepends = faad2 makedepends = lirc + makedepends = libxv makedepends = libxvmc makedepends = enca - makedepends = libvdpau - makedepends = opencore-amr makedepends = libdca makedepends = a52dec - makedepends = schroedinger makedepends = libvpx - makedepends = libpulse - makedepends = fribidi makedepends = unzip makedepends = mesa makedepends = live-media makedepends = yasm makedepends = git - makedepends = fontconfig makedepends = mpg123 makedepends = ladspa - makedepends = libass - makedepends = libbluray + makedepends = libcdio + makedepends = zlib makedepends = libcdio-paranoia - makedepends = opus makedepends = subversion makedepends = x264 - makedepends = libx264 + makedepends = libx264.so makedepends = rtmpdump - makedepends = gnutls - makedepends = gsm makedepends = libdvdcss makedepends = libdvdread makedepends = libdvdnav - options = !buildflags + makedepends = ffmpeg + makedepends = giflib + makedepends = libgif.so + makedepends = libbs2b + makedepends = fribidi + makedepends = opus + makedepends = libvorbis + makedepends = libvorbis.so + makedepends = gsm + makedepends = libpulse + makedepends = alsa-lib + makedepends = glibc + makedepends = libass + makedepends = libass.so + makedepends = libjpeg + makedepends = libpng + makedepends = libogg + makedepends = libtheora + makedepends = libbluray + makedepends = libbluray.so + makedepends = xvidcore + makedepends = libxvidcore.so + makedepends = ncurses + makedepends = libncursesw.so + makedepends = fontconfig + makedepends = freetype2 + makedepends = libx11 + makedepends = libxext + makedepends = libvdpau + makedepends = libgl + makedepends = lame + makedepends = desktop-file-utils + makedepends = ttf-font + makedepends = openal + makedepends = speex + makedepends = libmpeg2 options = !emptydirs - source = mplayer-37553::svn://svn.mplayerhq.hu/mplayer/trunk#revision=37553 - source = http://ffmpeg.org/releases/ffmpeg-2.8.2.tar.bz2 + source = mplayer::svn://svn.mplayerhq.hu/mplayer/trunk + source = https://ffmpeg.org/releases/ffmpeg-4.2.tar.bz2 source = mplayer.desktop - source = ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch - md5sums = SKIP - md5sums = 99f31723326dfe1bfd1bc7521338f2d2 - md5sums = 62f44a58f072b2b1a3c3d3e4976d64b3 - md5sums = 71be9bcd297cb9ce833bbc5d425c0470 + source = include-samba-4.0.patch + source = revert-icl-fixes.patch + sha512sums = SKIP + sha512sums = 74d06a420af61e05d9e076f4f433e8316590c3b850ada96e74c1df39431db1595f74315bdef624153edb160b8bef8683a4e9f35d69714cde4b5ec72aeb1d28e1 + sha512sums = d3c5cbf0035279c6f307e4e225473d7b77f9b56566537a26aa694e68446b9e3240333296da627ad5af83b04cc8f476d1a3f8c05e4cf81cd6e77153feb4ed74bc + sha512sums = 9debb8c58b996f6c716c22c86c720bf9dc49b4ee9b76c57519f791667ae1de2cc6f5add878fbf4ac02c6b6fd1865e1bcfa6105e75de4bf7ec596c338ed0cae99 + sha512sums = 0cae0b26d3d97fd4c962962c43a481de20335369cbca406cadfc9bda1a0608b32f5374e76c477cb9a85bda83a568a1ed17126df224ae61579d0a402c1824aea8 pkgname = mplayer-svn pkgdesc = Media player for Linux @@ -74,40 +100,58 @@ pkgname = mplayer-svn depends = a52dec depends = libvpx depends = lirc - depends = libx264 + depends = x264 depends = libmng depends = libdca depends = aalib - depends = lame - depends = fontconfig - depends = libgl depends = libxinerama - depends = libvdpau - depends = libpulse - depends = xvidcore - depends = opencore-amr + depends = smbclient depends = jack depends = libmad - depends = sdl - depends = libtheora depends = libcaca - depends = libxxf86dga - depends = fribidi - depends = libjpeg + depends = libxxf86vm depends = faac depends = faad2 + depends = libxv depends = libxvmc - depends = schroedinger depends = mpg123 - depends = libass - depends = libxxf86vm - depends = libbluray + depends = libx11 + depends = libcdio depends = libcdio-paranoia - depends = opus depends = rtmpdump - depends = gsm - depends = gnutls + depends = libdvdread depends = libdvdnav + depends = ffmpeg + depends = libbs2b + depends = alsa-lib + depends = giflib + depends = libgif.so + depends = glibc + depends = libass + depends = libass.so + depends = zlib + depends = libjpeg + depends = libpng + depends = libpulse + depends = libogg + depends = fribidi + depends = libtheora + depends = libvorbis + depends = libvorbis.so + depends = libbluray + depends = libbluray.so + depends = xvidcore + depends = libxvidcore.so + depends = ncurses + depends = libncursesw.so + depends = fontconfig + depends = freetype2 + depends = libxext + depends = libvdpau + depends = libgl + depends = openal + depends = speex + depends = libmpeg2 provides = mplayer conflicts = mplayer backup = etc/mplayer/codecs.conf @@ -115,36 +159,50 @@ pkgname = mplayer-svn pkgname = mencoder-svn pkgdesc = Free command line video decoding, encoding and filtering tool + depends = glibc depends = enca depends = a52dec depends = libvpx - depends = libx264 + depends = x264 + depends = libx264.so depends = libmng depends = libdca - depends = bzip2 - depends = lame - depends = alsa-lib - depends = fontconfig - depends = giflib - depends = libpng - depends = xvidcore - depends = opencore-amr + depends = smbclient depends = libmad - depends = libtheora - depends = fribidi - depends = libjpeg depends = faac depends = faad2 - depends = schroedinger depends = mpg123 - depends = libass - depends = libbluray + depends = libcdio depends = libcdio-paranoia - depends = libvorbis - depends = opus depends = rtmpdump - depends = gsm + depends = libdvdread depends = libdvdnav + depends = ffmpeg + depends = libbs2b + depends = ncurses + depends = libncursesw.so + depends = zlib + depends = alsa-lib + depends = fontconfig + depends = freetype2 + depends = fribidi + depends = giflib + depends = libgif.so + depends = libvorbis + depends = libvorbis.so + depends = libpng + depends = libjpeg + depends = libass + depends = libass.so + depends = lame + depends = libbluray + depends = libbluray.so + depends = libtheora + depends = xvidcore + depends = libxvidcore.so + depends = openal + depends = speex + depends = libmpeg2 provides = mencoder conflicts = mencoder @@ -1,117 +1,132 @@ -# Maintainer: Eric Toombs <e double u toombs at uwaterloo dot ca> +# Maintainer: Felix Golatofski <contact@xdfr.de> +# Contributor: Eric Toombs <e double u toombs at uwaterloo dot ca> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgbase='mplayer-svn' pkgname=('mplayer-svn' 'mencoder-svn') -pkgver=37553 +pkgver=38184M pkgrel=1 -_ffmpegver=2.8.2 +_ffmpegver=4.2 +pkgdesc='Media player for Linux' +url='http://www.mplayerhq.hu/' arch=('i686' 'x86_64') -makedepends=( - 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' - 'xvidcore' 'libmng' 'libxss' 'libgl' 'aalib' 'jack' 'libcaca' - 'faac' 'faad2' 'lirc' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' - 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa' - 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' - 'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gnutls' - 'gsm' 'libdvdcss' 'libdvdread' 'libdvdnav' -) license=('GPL') -url='http://www.mplayerhq.hu/' -options=('!buildflags' '!emptydirs') -source=("mplayer-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver" - "http://ffmpeg.org/releases/ffmpeg-$_ffmpegver.tar.bz2" +makedepends=('xorgproto' 'libxxf86vm' 'libmad' 'libxinerama' 'libmng' 'libxss' + 'smbclient' 'aalib' 'jack' 'libcaca' 'faac' 'faad2' 'lirc' 'libxv' + 'libxvmc' 'enca' 'libdca' 'a52dec' 'libvpx' 'unzip' 'mesa' + 'live-media' 'yasm' 'git' 'mpg123' 'ladspa' 'libcdio' 'zlib' + 'libcdio-paranoia' 'subversion' 'x264' 'libx264.so' 'rtmpdump' + 'libdvdcss' 'libdvdread' 'libdvdnav' 'ffmpeg' 'giflib' 'libgif.so' + 'libbs2b' 'fribidi' 'opus' 'libvorbis' 'libvorbis.so' 'gsm' + 'libpulse' 'alsa-lib' 'glibc' 'libass' 'libass.so' 'libjpeg' + 'libpng' 'libogg' 'libtheora' 'libbluray' 'libbluray.so' + 'xvidcore' 'libxvidcore.so' 'ncurses' 'libncursesw.so' + 'fontconfig' 'freetype2' 'libx11' 'libxext' 'libvdpau' 'libgl' + 'lame' 'desktop-file-utils' 'ttf-font' 'openal' 'speex' + 'libmpeg2') +options=('!emptydirs') +source=("mplayer::svn://svn.mplayerhq.hu/mplayer/trunk" + "https://ffmpeg.org/releases/ffmpeg-$_ffmpegver.tar.bz2" 'mplayer.desktop' - 'ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch') -md5sums=('SKIP' - '99f31723326dfe1bfd1bc7521338f2d2' - '62f44a58f072b2b1a3c3d3e4976d64b3' - '71be9bcd297cb9ce833bbc5d425c0470') + include-samba-4.0.patch + revert-icl-fixes.patch) +sha512sums=('SKIP' + '74d06a420af61e05d9e076f4f433e8316590c3b850ada96e74c1df39431db1595f74315bdef624153edb160b8bef8683a4e9f35d69714cde4b5ec72aeb1d28e1' + 'd3c5cbf0035279c6f307e4e225473d7b77f9b56566537a26aa694e68446b9e3240333296da627ad5af83b04cc8f476d1a3f8c05e4cf81cd6e77153feb4ed74bc' + '9debb8c58b996f6c716c22c86c720bf9dc49b4ee9b76c57519f791667ae1de2cc6f5add878fbf4ac02c6b6fd1865e1bcfa6105e75de4bf7ec596c338ed0cae99' + '0cae0b26d3d97fd4c962962c43a481de20335369cbca406cadfc9bda1a0608b32f5374e76c477cb9a85bda83a568a1ed17126df224ae61579d0a402c1824aea8') pkgver() { - cd "mplayer-$pkgver" + cd "mplayer" svnversion } prepare() { - cd "mplayer-$pkgver" + cd "mplayer" mv "../ffmpeg-$_ffmpegver" ffmpeg - patch -d ffmpeg -Np1 <../ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch - + patch -p1 < "../include-samba-4.0.patch" + patch -p0 < "../revert-icl-fixes.patch" + # https://bugs.archlinux.org/task/62050 + sed -E "s|(#include <samba-4.0/libsmbclient.h>)|#include <time.h>\n\1|g" -i stream/stream_smb.c ./version.sh } build() { - cd "mplayer-$pkgver" - + cd "mplayer" + export CFLAGS="${CFLAGS/-march=x86-64/}" + export CFLAGS="${CFLAGS/-mtune=generic/}" + export LDFLAGS="${LDFLAGS/,O1/}" + export LDFLAGS="${LDFLAGS/,--sort-common/}" + ./configure --prefix=/usr \ --enable-runtime-cpudetection \ --disable-gui \ --disable-arts \ --disable-liblzo \ - --disable-speex \ - --disable-openal \ --disable-libdv \ --disable-musepack \ --disable-esd \ --disable-mga \ --disable-ass-internal \ --disable-cdparanoia \ - --disable-smb \ + --disable-ffmpeg_a \ --enable-xvmc \ --enable-radio \ --enable-radio-capture \ + --enable-smb \ --language=all \ - --confdir=/etc/mplayer - [[ "$CARCH" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak - + --confdir=/etc/mplayer \ + --extra-cflags="${CFLAGS} ${CPPFLAGS}" \ + --extra-ldflags="${LDFLAGS}" + [[ "${CARCH}" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak make } package_mplayer-svn() { pkgdesc='Media player for Linux' + backup=('etc/mplayer/codecs.conf' + 'etc/mplayer/input.conf') install='mplayer.install' - backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') - depends=( - 'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx' - 'lirc' 'libx264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' - 'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'xvidcore' - 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' - 'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' - 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' 'rtmpdump' - 'gsm' 'gnutls' 'libdvdnav' - ) + depends=('desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx' + 'lirc' 'x264' 'libmng' 'libdca' 'aalib' 'libxinerama' 'smbclient' + 'jack' 'libmad' 'libcaca' 'libxxf86vm' 'faac' 'faad2' + 'libxv' 'libxvmc' 'mpg123' 'libx11' 'libcdio' 'libcdio-paranoia' + 'rtmpdump' 'libdvdread' 'libdvdnav' 'ffmpeg' 'libbs2b' 'alsa-lib' + 'giflib' 'libgif.so' 'glibc' 'libass' 'libass.so' 'zlib' 'libjpeg' + 'libpng' 'libpulse' 'libogg' 'fribidi' 'libtheora' 'libvorbis' + 'libvorbis.so' 'libbluray' 'libbluray.so' 'xvidcore' + 'libxvidcore.so' 'ncurses' 'libncursesw.so' 'fontconfig' 'freetype2' + 'libxext' 'libvdpau' 'libgl' 'openal' 'speex' 'libmpeg2') conflicts=('mplayer') provides=('mplayer') - cd "mplayer-$pkgver" + cd "mplayer" make DESTDIR="$pkgdir" install-mplayer install-mplayer-man - install -Dm644 etc/{codecs.conf,input.conf,example.conf} \ - "$pkgdir/etc/mplayer/" - - # desktop file (FS#14770) - install -Dm644 ../mplayer.desktop \ - "$pkgdir"/usr/share/applications/mplayer.desktop - install -Dm644 etc/mplayer256x256.png \ - "$pkgdir"/usr/share/pixmaps/mplayer.png + install -Dm 644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}/etc/mplayer" + install -Dm 644 "${srcdir}/mplayer.desktop" -t "${pkgdir}/usr/share/applications" + install -Dm 644 etc/mplayer256x256.png "${pkgdir}/usr/share/pixmaps/mplayer.png" } package_mencoder-svn() { pkgdesc='Free command line video decoding, encoding and filtering tool' - depends=( - 'enca' 'a52dec' 'libvpx' 'libx264' 'libmng' 'libdca' 'bzip2' 'lame' - 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'xvidcore' - 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' - 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' - 'libvorbis' 'opus' 'rtmpdump' 'gsm' 'libdvdnav' - ) + depends=('glibc' 'enca' 'a52dec' 'libvpx' 'x264' 'libx264.so' 'libmng' 'libdca' + 'smbclient' 'libmad' 'faac' 'faad2' 'mpg123' 'libcdio' + 'libcdio-paranoia' 'rtmpdump' 'libdvdread' 'libdvdnav' 'ffmpeg' + 'libbs2b' 'ncurses' 'libncursesw.so' 'zlib' 'alsa-lib' 'fontconfig' + 'freetype2' 'fribidi' 'giflib' 'libgif.so' 'libvorbis' + 'libvorbis.so' 'libpng' 'libjpeg' 'libass' 'libass.so' 'lame' + 'libbluray' 'libbluray.so' 'libtheora' 'xvidcore' 'libxvidcore.so' + 'openal' 'speex' 'libmpeg2') conflicts=('mencoder') provides=('mencoder') - make -C mplayer-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man - find "$pkgdir"/usr/share/man -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} + + make -C ${pkgbase}-${pkgver} DESTDIR="${pkgdir}" install-mencoder install-mencoder-man + find "${pkgdir}/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} + } + +# vim: ts=2 sw=2 et: + diff --git a/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch deleted file mode 100644 index 15d2600d1c47..000000000000 --- a/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 -From: James Zern <jzern@google.com> -Date: Mon, 19 Oct 2015 22:44:11 -0700 -Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings - -VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed -from libvpx and the remaining values were never used here - -Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> -Signed-off-by: James Zern <jzern@google.com> ---- - libavcodec/libvpxenc.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c -index 5f39783..992122c 100644 ---- a/libavcodec/libvpxenc.c -+++ b/libavcodec/libvpxenc.c -@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { - - /** String mappings for enum vp8e_enc_control_id */ - static const char *const ctlidstr[] = { -- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", -- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", -- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", -- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", -- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", -- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", - [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", - [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", - [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", -- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", - [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", - [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", -- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", - [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", - [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", - [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", --- -1.7.10.4 - diff --git a/include-samba-4.0.patch b/include-samba-4.0.patch new file mode 100644 index 000000000000..2ed272b6a5f3 --- /dev/null +++ b/include-samba-4.0.patch @@ -0,0 +1,12 @@ +diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c +--- a/stream/stream_smb.c 2013-03-16 13:38:34.000000000 +0000 ++++ b/stream/stream_smb.c 2013-10-31 20:05:32.473947926 +0000 +@@ -18,7 +18,7 @@ + + #include "config.h" + +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + #include <unistd.h> + + #include "mp_msg.h" diff --git a/revert-icl-fixes.patch b/revert-icl-fixes.patch new file mode 100644 index 000000000000..e5f049ff514c --- /dev/null +++ b/revert-icl-fixes.patch @@ -0,0 +1,66 @@ +Index: libmpcodecs/vf_fspp.c +=================================================================== +--- libmpcodecs/vf_fspp.c (revision 37183) ++++ libmpcodecs/vf_fspp.c (revision 37181) +@@ -1598,10 +1598,6 @@ + + : "+S"(data), "+D"(output), "+c"(cnt), "=o"(temps) + : "d"(thr_adr) +- NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,MM_2,MM_FIX_1_414213562_A,MM_FIX_1_414213562,MM_FIX_0_382683433, +- ff_MM_FIX_0_541196100,MM_FIX_1_306562965,MM_FIX_0_847759065) +- NAMED_CONSTRAINTS_ADD(MM_FIX_0_566454497,MM_FIX_0_198912367,MM_FIX_2_613125930,MM_FIX_1_847759065, +- MM_FIX_1_082392200) + : "%"REG_a + ); + } +@@ -1871,8 +1867,6 @@ + + : "+S"(workspace), "+D"(output_adr), "+c"(cnt), "=o"(temps) + : "a"(output_stride*sizeof(short)) +- NAMED_CONSTRAINTS_ADD(MM_FIX_1_414213562_A,MM_FIX_2_613125930,MM_FIX_1_847759065,MM_FIX_1_082392200, +- MM_FIX_1_414213562,MM_DESCALE_RND) + : "%"REG_d + ); + } +@@ -1980,10 +1974,10 @@ + "movd (%%"REG_S",%%"REG_a",2), %%mm3 \n\t" //5 + "paddw %%mm4, %%mm1 \n\t" + +- "movq %%mm5, %3 \n\t" //t7 ++ "movq %%mm5, 0*8+%3 \n\t" //t7 + "punpcklbw %%mm7, %%mm3 \n\t" + +- "movq %%mm6, %4 \n\t" //t6 ++ "movq %%mm6, 1*8+%3 \n\t" //t6 + "movq %%mm2, %%mm4 \n\t" + + "movd (%%"REG_S"), %%mm5 \n\t" //3 +@@ -2029,7 +2023,7 @@ + "psubw %%mm1, %%mm5 \n\t" //d1 + "movq %%mm0, %%mm6 \n\t" + +- "movq %4, %%mm1 \n\t" ++ "movq 1*8+%3, %%mm1 \n\t" + "punpcklwd %%mm5, %%mm0 \n\t" + + "punpckhwd %%mm5, %%mm6 \n\t" +@@ -2053,7 +2047,7 @@ + "movq %%mm7, "DCTSIZE_S"*3*2(%%"REG_D") \n\t" + "psllw $2, %%mm3 \n\t" //t10 + +- "movq %3, %%mm2 \n\t" ++ "movq 0*8+%3, %%mm2 \n\t" + "psllw $2, %%mm4 \n\t" //t11 + + "pmulhw "MANGLE(MM_FIX_0_707106781)", %%mm4 \n\t" //z3 +@@ -2116,9 +2110,8 @@ + "dec %%"REG_c" \n\t" + "jnz 6b \n\t" + +- : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps), "=o"(temps[1]) ++ : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps) + : "a"(line_size) +- NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,ff_MM_FIX_0_541196100,MM_FIX_0_382683433,MM_FIX_1_306562965) + : "%"REG_d); + } + |