Attachment #265409 for bug #356373

Lines 335-341 Link Here

(-)branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd (+2 lines)
335	<xs:simpleType>	335	<xs:simpleType>
336	<xs:restriction base="xs:string">	336	<xs:restriction base="xs:string">
337	<xs:enumeration value="none"/>	337	<xs:enumeration value="none"/>
		338	<!-- blind deprecated core 110 -->
338	<xs:enumeration value="blind"/>	339	<xs:enumeration value="blind"/>
		340	<xs:enumeration value="simple"/>
339	<xs:enumeration value="smart"/>	341	<xs:enumeration value="smart"/>
340	</xs:restriction>	342	</xs:restriction>
341	</xs:simpleType>	343	</xs:simpleType>

Lines 1386-1394 Link Here

(-)branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp (+11 lines)
1386	case X264_WEIGHTP_NONE:	1386	case X264_WEIGHTP_NONE:
1387	strcpy((char*)xmlBuffer, "none");	1387	strcpy((char*)xmlBuffer, "none");
1388	break;	1388	break;
		1389	#if X264_BUILD < 110
1389	case X264_WEIGHTP_BLIND:	1390	case X264_WEIGHTP_BLIND:
1390	strcpy((char*)xmlBuffer, "blind");	1391	strcpy((char*)xmlBuffer, "blind");
1391	break;	1392	break;
		1393	#else
		1394	case X264_WEIGHTP_SIMPLE:
		1395	strcpy((char*)xmlBuffer, "simple");
		1396	break;
		1397	#endif
1392	case X264_WEIGHTP_SMART:	1398	case X264_WEIGHTP_SMART:
1393	strcpy((char*)xmlBuffer, "smart");	1399	strcpy((char*)xmlBuffer, "smart");
1394	break;	1400	break;
Lines 1895-1902 Link Here
1895	{	1901	{
1896	int weightedPredPFrames = X264_WEIGHTP_NONE;	1902	int weightedPredPFrames = X264_WEIGHTP_NONE;
1897		1903
		1904	#if X264_BUILD < 110
1898	if (strcmp(content, "blind") == 0)	1905	if (strcmp(content, "blind") == 0)
1899	weightedPredPFrames = X264_WEIGHTP_BLIND;	1906	weightedPredPFrames = X264_WEIGHTP_BLIND;
		1907	#else
		1908	if (strcmp(content, "simple") == 0)
		1909	weightedPredPFrames = X264_WEIGHTP_SIMPLE;
		1910	#endif
1900	else if (strcmp(content, "smart") == 0)	1911	else if (strcmp(content, "smart") == 0)
1901	weightedPredPFrames = X264_WEIGHTP_SMART;	1912	weightedPredPFrames = X264_WEIGHTP_SMART;
1902		1913




                </item>
                <item>
                 <property name="text">
                  <string>Weighted References</string>
                 </property>
                </item>
                <item>
                 <property name="text">
                  <string>Weighted References + Duplicates</string>
                 </property>
                </item>
               </widget>

Lines 94-99 Link Here

(-)branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp (+7 lines)
94	connect(ui.dct8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(dct8x8CheckBox_toggled(bool)));	94	connect(ui.dct8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(dct8x8CheckBox_toggled(bool)));
95	connect(ui.p8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(p8x8CheckBox_toggled(bool)));	95	connect(ui.p8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(p8x8CheckBox_toggled(bool)));
96		96
		97	#if X264_BUILD < 110
		98	ui.weightedPPredictComboBox->clear();
		99	ui.weightedPPredictComboBox->addItem(tr("Disabled"));
		100	ui.weightedPPredictComboBox->addItem(tr("Blind Offset"));
		101	ui.weightedPPredictComboBox->addItem(tr("Smart Analysis"));
		102	#endif
		103
97	// Frame tab	104	// Frame tab
98	connect(ui.loopFilterCheckBox, SIGNAL(toggled(bool)), this, SLOT(loopFilterCheckBox_toggled(bool)));	105	connect(ui.loopFilterCheckBox, SIGNAL(toggled(bool)), this, SLOT(loopFilterCheckBox_toggled(bool)));
99		106

Return to bug 356373

Lines 1131-1142 Link Here

(-)branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui (-2 / +2 lines)
1131	</item>	1131	</item>
1132	<item>	1132	<item>
1133	<property name="text">	1133	<property name="text">
1134	<string>Blind Offset</string>	1134	<string>Weighted References</string>
1135	</property>	1135	</property>
1136	</item>	1136	</item>
1137	<item>	1137	<item>
1138	<property name="text">	1138	<property name="text">
1139	<string>Smart Analysis</string>	1139	<string>Weighted References + Duplicates</string>
1140	</property>	1140	</property>
1141	</item>	1141	</item>
1142	</widget>	1142	</widget>