summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/avidemux/files/avidemux-2.5.4-x264.patch')
-rw-r--r--media-video/avidemux/files/avidemux-2.5.4-x264.patch23
1 files changed, 0 insertions, 23 deletions
diff --git a/media-video/avidemux/files/avidemux-2.5.4-x264.patch b/media-video/avidemux/files/avidemux-2.5.4-x264.patch
deleted file mode 100644
index 5dd3506..0000000
--- a/media-video/avidemux/files/avidemux-2.5.4-x264.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nuar avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2010-09-29 22:20:48.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-04-18 12:26:34.482304155 +0200
-@@ -343,7 +343,8 @@
- delete [] xml;
-
- fillConfigurationComboBox();
-- selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);
-+ QString temporary = QFileInfo(configFileName).completeBaseName();
-+ selectConfiguration(&temporary, PLUGIN_CONFIG_USER);
- }
-
- delete [] configDirectory;
-@@ -580,7 +581,8 @@
- disableGenericSlots = true;
- options->getPresetConfiguration(&configurationName, &configurationType);
-
-- bool foundConfig = selectConfiguration(&QString(configurationName), configurationType);
-+ QString temporary2 = QString(configurationName);
-+ bool foundConfig = selectConfiguration(&temporary2, configurationType);
-
- if (!foundConfig)
- printf("Configuration %s (type %d) could not be found. Using snapshot.\n", configurationName, configurationType);