summaryrefslogtreecommitdiff
path: root/extra/avidemux
diff options
context:
space:
mode:
Diffstat (limited to 'extra/avidemux')
-rw-r--r--extra/avidemux/2.5.4_audioDevice.patch12
-rw-r--r--extra/avidemux/x264.patch21
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;
-