Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 265619 Details for
Bug 356373
media-video/avidemux-2.5.4-r1 fails to build with >=media-libs/x264-0.0.20110223
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
avidemux-2.5.4-x264-version-fix.patch
avidemux-2.5.4-x264-version-fix.patch (text/plain), 3.91 KB, created by
PhobosK
on 2011-03-12 10:54:25 UTC
(
hide
)
Description:
avidemux-2.5.4-x264-version-fix.patch
Filename:
MIME Type:
Creator:
PhobosK
Created:
2011-03-12 10:54:25 UTC
Size:
3.91 KB
patch
obsolete
>diff -ur 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 2011-03-12 12:04:53.100131791 +0200 >+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-03-12 12:02:58.063666919 +0200 >@@ -94,6 +94,13 @@ > connect(ui.dct8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(dct8x8CheckBox_toggled(bool))); > connect(ui.p8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(p8x8CheckBox_toggled(bool))); > >+#if X264_BUILD < 110 >+ ui.weightedPPredictComboBox->clear(); >+ ui.weightedPPredictComboBox->addItem(tr("Disabled")); >+ ui.weightedPPredictComboBox->addItem(tr("Blind Offset")); >+ ui.weightedPPredictComboBox->addItem(tr("Smart Analysis")); >+#endif >+ > // Frame tab > connect(ui.loopFilterCheckBox, SIGNAL(toggled(bool)), this, SLOT(loopFilterCheckBox_toggled(bool))); > >diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui >--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui 2011-03-12 12:04:53.100131791 +0200 >+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui 2011-03-12 12:02:58.063666919 +0200 >@@ -1131,12 +1131,12 @@ > </item> > <item> > <property name="text"> >- <string>Blind Offset</string> >+ <string>Weighted References</string> > </property> > </item> > <item> > <property name="text"> >- <string>Smart Analysis</string> >+ <string>Weighted References + Duplicates</string> > </property> > </item> > </widget> >diff -ur 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 2011-03-12 12:04:53.100131791 +0200 >+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-03-12 12:02:58.062666914 +0200 >@@ -1386,9 +1386,15 @@ > case X264_WEIGHTP_NONE: > strcpy((char*)xmlBuffer, "none"); > break; >+#if X264_BUILD < 110 > case X264_WEIGHTP_BLIND: > strcpy((char*)xmlBuffer, "blind"); > break; >+#else >+ case X264_WEIGHTP_SIMPLE: >+ strcpy((char*)xmlBuffer, "simple"); >+ break; >+#endif > case X264_WEIGHTP_SMART: > strcpy((char*)xmlBuffer, "smart"); > break; >@@ -1895,8 +1901,13 @@ > { > int weightedPredPFrames = X264_WEIGHTP_NONE; > >+#if X264_BUILD < 110 > if (strcmp(content, "blind") == 0) > weightedPredPFrames = X264_WEIGHTP_BLIND; >+#else >+ if (strcmp(content, "simple") == 0) >+ weightedPredPFrames = X264_WEIGHTP_SIMPLE; >+#endif > else if (strcmp(content, "smart") == 0) > weightedPredPFrames = X264_WEIGHTP_SMART; > >diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd >--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd 2011-03-12 12:04:53.100131791 +0200 >+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd 2011-03-12 12:02:58.062666914 +0200 >@@ -335,7 +335,9 @@ > <xs:simpleType> > <xs:restriction base="xs:string"> > <xs:enumeration value="none"/> >+ <!-- blind deprecated core 110 --> > <xs:enumeration value="blind"/> >+ <xs:enumeration value="simple"/> > <xs:enumeration value="smart"/> > </xs:restriction> > </xs:simpleType>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 356373
:
263745
|
263769
|
263771
|
265409
| 265619 |
265621