diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
commit | f5e137fdf748b757bacfc50577e5d48a693d31c4 (patch) | |
tree | c75bdfef17b69eff3b8bb20b285c880d7f9183c0 /extra/avidemux | |
parent | 300b3ee60aef9cfa0a32f5c69aa5e25ad637285f (diff) | |
parent | dd5222c4ae447eb7a6bda08ec5a3c2339852dc16 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chntpw/PKGBUILD
community/hardinfo/PKGBUILD
community/obconf/obconf.install
community/xplc/PKGBUILD
community/zziplib/PKGBUILD
core/rp-pppoe/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/icon-naming-utils/PKGBUILD
extra/lxmenu-data/PKGBUILD
extra/openbox/PKGBUILD
extra/phonon-xine/PKGBUILD
extra/qt/PKGBUILD
extra/zope-interface/PKGBUILD
libre/pacman/PKGBUILD
libre/pacman/pacman.conf.mips64el
libre/pacman/rePKGBUILD
testing/coreutils/PKGBUILD
testing/net-tools/PKGBUILD
Diffstat (limited to 'extra/avidemux')
-rw-r--r-- | extra/avidemux/2.5.4_audioDevice.patch | 12 | ||||
-rw-r--r-- | extra/avidemux/x264.patch | 21 |
2 files changed, 0 insertions, 33 deletions
diff --git a/extra/avidemux/2.5.4_audioDevice.patch b/extra/avidemux/2.5.4_audioDevice.patch deleted file mode 100644 index 9f1dd1e84..000000000 --- a/extra/avidemux/2.5.4_audioDevice.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- cmake/config.h.cmake.orig 2010-10-29 12:51:05.000000000 -0400 -+++ cmake/config.h.cmake 2010-10-29 12:51:48.000000000 -0400 -@@ -76,9 +76,7 @@ - /* use Nvwa memory leak detector */
- #cmakedefine FIND_LEAKS
-
--#if defined(OSS_SUPPORT) || defined (USE_ARTS) || defined(USE_SDL) || defined(__APPLE__) || defined(__WIN32) || defined(ALSA_SUPPORT)
- #define HAVE_AUDIO
--#endif
-
- #define HAVE_ENCODER
-
diff --git a/extra/avidemux/x264.patch b/extra/avidemux/x264.patch deleted file mode 100644 index 7200153d1..000000000 --- a/extra/avidemux/x264.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp ---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2010-10-10 06:45:42.000000000 -0700 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-01-16 07:16:48.283341102 -0800 -@@ -1386,7 +1386,7 @@ - case X264_WEIGHTP_NONE:
- strcpy((char*)xmlBuffer, "none");
- break;
-- case X264_WEIGHTP_BLIND:
-+ case X264_WEIGHTP_SIMPLE:
- strcpy((char*)xmlBuffer, "blind");
- break;
- case X264_WEIGHTP_SMART:
-@@ -1896,7 +1896,7 @@ - int weightedPredPFrames = X264_WEIGHTP_NONE;
-
- if (strcmp(content, "blind") == 0)
-- weightedPredPFrames = X264_WEIGHTP_BLIND;
-+ weightedPredPFrames = X264_WEIGHTP_SIMPLE;
- else if (strcmp(content, "smart") == 0)
- weightedPredPFrames = X264_WEIGHTP_SMART;
-
|