Date: Saturday, November 14, 2015 @ 11:24:26 Author: alucryd Revision: 251030
archrelease: copy trunk to extra-i686, extra-x86_64 Added: ffmpeg/repos/extra-i686/PKGBUILD (from rev 251029, ffmpeg/trunk/PKGBUILD) ffmpeg/repos/extra-i686/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch (from rev 251029, ffmpeg/trunk/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) ffmpeg/repos/extra-x86_64/PKGBUILD (from rev 251029, ffmpeg/trunk/PKGBUILD) ffmpeg/repos/extra-x86_64/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch (from rev 251029, ffmpeg/trunk/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) Deleted: ffmpeg/repos/extra-i686/PKGBUILD ffmpeg/repos/extra-i686/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch ffmpeg/repos/extra-x86_64/PKGBUILD ffmpeg/repos/extra-x86_64/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch -------------------------------------------------------------------------------+ /PKGBUILD | 190 ++++++++++ /ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 82 ++++ extra-i686/PKGBUILD | 95 ----- extra-i686/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 41 -- extra-x86_64/PKGBUILD | 95 ----- extra-x86_64/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 41 -- 6 files changed, 272 insertions(+), 272 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-11-14 10:24:12 UTC (rev 251029) +++ extra-i686/PKGBUILD 2015-11-14 10:24:26 UTC (rev 251030) @@ -1,95 +0,0 @@ -# $Id$ -# Maintainer: Ionut Biru <ib...@archlinux.org> -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> -# Contributor: Paul Mattal <p...@archlinux.org> - -pkgname=ffmpeg -pkgver=2.8.1 -pkgrel=4 -epoch=1 -pkgdesc='Complete solution to record, convert and stream audio and video' -arch=('i686' 'x86_64') -url='http://ffmpeg.org/' -license=('GPL3') -depends=( - 'alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame' 'libass' - 'libbluray' 'libmodplug' 'libpulse' 'libsoxr' 'libssh' 'libtheora' - 'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg' 'opus' - 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib' - 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' 'libvpx.so' 'libx264.so' - 'libx265.so' -) -makedepends=('hardening-wrapper' 'ladspa' 'libvdpau' 'yasm') -optdepends=('ladspa: LADSPA filters') -provides=( - 'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' - 'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' - 'libswscale.so' -) -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc} - ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) -validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel -md5sums=('63b2cfeea930e942ff7579fd0064c5be' - 'SKIP' - '71be9bcd297cb9ce833bbc5d425c0470') - -prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch -} - -build() { - cd $pkgname-$pkgver - - ./configure \ - --prefix=/usr \ - --disable-debug \ - --disable-static \ - --disable-stripping \ - --enable-avisynth \ - --enable-avresample \ - --enable-fontconfig \ - --enable-gnutls \ - --enable-gpl \ - --enable-ladspa \ - --enable-libass \ - --enable-libbluray \ - --enable-libfreetype \ - --enable-libfribidi \ - --enable-libgsm \ - --enable-libmodplug \ - --enable-libmp3lame \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libopenjpeg \ - --enable-libopus \ - --enable-libpulse \ - --enable-libschroedinger \ - --enable-libsoxr \ - --enable-libspeex \ - --enable-libssh \ - --enable-libtheora \ - --enable-libv4l2 \ - --enable-libvidstab \ - --enable-libvorbis \ - --enable-libvpx \ - --enable-libwebp \ - --enable-libx264 \ - --enable-libx265 \ - --enable-libxvid \ - --enable-shared \ - --enable-version3 \ - --enable-x11grab \ - - make - make tools/qt-faststart - make doc/ff{mpeg,play,server}.1 -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install install-man - install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart -} Copied: ffmpeg/repos/extra-i686/PKGBUILD (from rev 251029, ffmpeg/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-11-14 10:24:26 UTC (rev 251030) @@ -0,0 +1,95 @@ +# $Id$ +# Maintainer: Ionut Biru <ib...@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> +# Contributor: Paul Mattal <p...@archlinux.org> + +pkgname=ffmpeg +pkgver=2.8.2 +pkgrel=1 +epoch=1 +pkgdesc='Complete solution to record, convert and stream audio and video' +arch=('i686' 'x86_64') +url='http://ffmpeg.org/' +license=('GPL3') +depends=( + 'alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame' 'libass' + 'libbluray' 'libmodplug' 'libpulse' 'libsoxr' 'libssh' 'libtheora' + 'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg' 'opus' + 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib' + 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' 'libvpx.so' 'libx264.so' + 'libx265.so' +) +makedepends=('hardening-wrapper' 'ladspa' 'libvdpau' 'yasm') +optdepends=('ladspa: LADSPA filters') +provides=( + 'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' + 'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' + 'libswscale.so' +) +source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc} + ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) +validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel +md5sums=('99f31723326dfe1bfd1bc7521338f2d2' + 'SKIP' + '71be9bcd297cb9ce833bbc5d425c0470') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch +} + +build() { + cd $pkgname-$pkgver + + ./configure \ + --prefix=/usr \ + --disable-debug \ + --disable-static \ + --disable-stripping \ + --enable-avisynth \ + --enable-avresample \ + --enable-fontconfig \ + --enable-gnutls \ + --enable-gpl \ + --enable-ladspa \ + --enable-libass \ + --enable-libbluray \ + --enable-libfreetype \ + --enable-libfribidi \ + --enable-libgsm \ + --enable-libmodplug \ + --enable-libmp3lame \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libopenjpeg \ + --enable-libopus \ + --enable-libpulse \ + --enable-libschroedinger \ + --enable-libsoxr \ + --enable-libspeex \ + --enable-libssh \ + --enable-libtheora \ + --enable-libv4l2 \ + --enable-libvidstab \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libwebp \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libxvid \ + --enable-shared \ + --enable-version3 \ + --enable-x11grab \ + + make + make tools/qt-faststart + make doc/ff{mpeg,play,server}.1 +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install install-man + install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart +} Deleted: extra-i686/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch =================================================================== --- extra-i686/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch 2015-11-14 10:24:12 UTC (rev 251029) +++ extra-i686/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch 2015-11-14 10:24:26 UTC (rev 251030) @@ -1,41 +0,0 @@ -From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 -From: James Zern <jz...@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 <mich...@niedermayer.cc> -Signed-off-by: James Zern <jz...@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 - Copied: ffmpeg/repos/extra-i686/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch (from rev 251029, ffmpeg/trunk/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) =================================================================== --- extra-i686/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch (rev 0) +++ extra-i686/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch 2015-11-14 10:24:26 UTC (rev 251030) @@ -0,0 +1,41 @@ +From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 +From: James Zern <jz...@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 <mich...@niedermayer.cc> +Signed-off-by: James Zern <jz...@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 + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-11-14 10:24:12 UTC (rev 251029) +++ extra-x86_64/PKGBUILD 2015-11-14 10:24:26 UTC (rev 251030) @@ -1,95 +0,0 @@ -# $Id$ -# Maintainer: Ionut Biru <ib...@archlinux.org> -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> -# Contributor: Paul Mattal <p...@archlinux.org> - -pkgname=ffmpeg -pkgver=2.8.1 -pkgrel=4 -epoch=1 -pkgdesc='Complete solution to record, convert and stream audio and video' -arch=('i686' 'x86_64') -url='http://ffmpeg.org/' -license=('GPL3') -depends=( - 'alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame' 'libass' - 'libbluray' 'libmodplug' 'libpulse' 'libsoxr' 'libssh' 'libtheora' - 'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg' 'opus' - 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib' - 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' 'libvpx.so' 'libx264.so' - 'libx265.so' -) -makedepends=('hardening-wrapper' 'ladspa' 'libvdpau' 'yasm') -optdepends=('ladspa: LADSPA filters') -provides=( - 'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' - 'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' - 'libswscale.so' -) -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc} - ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) -validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel -md5sums=('63b2cfeea930e942ff7579fd0064c5be' - 'SKIP' - '71be9bcd297cb9ce833bbc5d425c0470') - -prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch -} - -build() { - cd $pkgname-$pkgver - - ./configure \ - --prefix=/usr \ - --disable-debug \ - --disable-static \ - --disable-stripping \ - --enable-avisynth \ - --enable-avresample \ - --enable-fontconfig \ - --enable-gnutls \ - --enable-gpl \ - --enable-ladspa \ - --enable-libass \ - --enable-libbluray \ - --enable-libfreetype \ - --enable-libfribidi \ - --enable-libgsm \ - --enable-libmodplug \ - --enable-libmp3lame \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libopenjpeg \ - --enable-libopus \ - --enable-libpulse \ - --enable-libschroedinger \ - --enable-libsoxr \ - --enable-libspeex \ - --enable-libssh \ - --enable-libtheora \ - --enable-libv4l2 \ - --enable-libvidstab \ - --enable-libvorbis \ - --enable-libvpx \ - --enable-libwebp \ - --enable-libx264 \ - --enable-libx265 \ - --enable-libxvid \ - --enable-shared \ - --enable-version3 \ - --enable-x11grab \ - - make - make tools/qt-faststart - make doc/ff{mpeg,play,server}.1 -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install install-man - install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart -} Copied: ffmpeg/repos/extra-x86_64/PKGBUILD (from rev 251029, ffmpeg/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-11-14 10:24:26 UTC (rev 251030) @@ -0,0 +1,95 @@ +# $Id$ +# Maintainer: Ionut Biru <ib...@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> +# Contributor: Paul Mattal <p...@archlinux.org> + +pkgname=ffmpeg +pkgver=2.8.2 +pkgrel=1 +epoch=1 +pkgdesc='Complete solution to record, convert and stream audio and video' +arch=('i686' 'x86_64') +url='http://ffmpeg.org/' +license=('GPL3') +depends=( + 'alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame' 'libass' + 'libbluray' 'libmodplug' 'libpulse' 'libsoxr' 'libssh' 'libtheora' + 'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg' 'opus' + 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib' + 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' 'libvpx.so' 'libx264.so' + 'libx265.so' +) +makedepends=('hardening-wrapper' 'ladspa' 'libvdpau' 'yasm') +optdepends=('ladspa: LADSPA filters') +provides=( + 'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' + 'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' + 'libswscale.so' +) +source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc} + ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) +validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel +md5sums=('99f31723326dfe1bfd1bc7521338f2d2' + 'SKIP' + '71be9bcd297cb9ce833bbc5d425c0470') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch +} + +build() { + cd $pkgname-$pkgver + + ./configure \ + --prefix=/usr \ + --disable-debug \ + --disable-static \ + --disable-stripping \ + --enable-avisynth \ + --enable-avresample \ + --enable-fontconfig \ + --enable-gnutls \ + --enable-gpl \ + --enable-ladspa \ + --enable-libass \ + --enable-libbluray \ + --enable-libfreetype \ + --enable-libfribidi \ + --enable-libgsm \ + --enable-libmodplug \ + --enable-libmp3lame \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libopenjpeg \ + --enable-libopus \ + --enable-libpulse \ + --enable-libschroedinger \ + --enable-libsoxr \ + --enable-libspeex \ + --enable-libssh \ + --enable-libtheora \ + --enable-libv4l2 \ + --enable-libvidstab \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libwebp \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libxvid \ + --enable-shared \ + --enable-version3 \ + --enable-x11grab \ + + make + make tools/qt-faststart + make doc/ff{mpeg,play,server}.1 +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install install-man + install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart +} Deleted: extra-x86_64/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch =================================================================== --- extra-x86_64/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch 2015-11-14 10:24:12 UTC (rev 251029) +++ extra-x86_64/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch 2015-11-14 10:24:26 UTC (rev 251030) @@ -1,41 +0,0 @@ -From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 -From: James Zern <jz...@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 <mich...@niedermayer.cc> -Signed-off-by: James Zern <jz...@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 - Copied: ffmpeg/repos/extra-x86_64/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch (from rev 251029, ffmpeg/trunk/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) =================================================================== --- extra-x86_64/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch (rev 0) +++ extra-x86_64/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch 2015-11-14 10:24:26 UTC (rev 251030) @@ -0,0 +1,41 @@ +From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 +From: James Zern <jz...@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 <mich...@niedermayer.cc> +Signed-off-by: James Zern <jz...@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 +