rpms/avidemux/devel avidemux-2.5.4-x264_fix.patch, 1.1, 1.2 avidemux.spec, 1.43, 1.44 avidemux_2.5.4-ffmpeg-aac.patch, 1.1, 1.2

Richard Shaw hobbes1069 at rpmfusion.org
Sun Apr 24 16:34:57 CEST 2011 

Author: hobbes1069

Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9970

Modified Files:
	avidemux-2.5.4-x264_fix.patch avidemux.spec 
	avidemux_2.5.4-ffmpeg-aac.patch 
Log Message:
* Sun Apr 24 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-6
- Really fix AAC this time.
- Really fix x264 this time.


avidemux-2.5.4-x264_fix.patch:
 qt4/x264ConfigDialog.cpp |    7 +++++++
 qt4/x264ConfigDialog.ui  |    4 ++--
 x264Options.cpp          |   11 +++++++++++
 x264Param.xsd            |    2 ++
 4 files changed, 22 insertions(+), 2 deletions(-)

Index: avidemux-2.5.4-x264_fix.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux-2.5.4-x264_fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avidemux-2.5.4-x264_fix.patch	19 Apr 2011 23:50:00 -0000	1.1
+++ avidemux-2.5.4-x264_fix.patch	24 Apr 2011 14:34:56 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Naur 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 15:20:48.000000000 -0500
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2011-04-17 16:10:58.327555878 -0500
+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)));
@@ -15,9 +15,27 @@
  	// Frame tab
  	connect(ui.loopFilterCheckBox, SIGNAL(toggled(bool)), this, SLOT(loopFilterCheckBox_toggled(bool)));
  
-diff -Naur 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-04-17 16:17:26.318246984 -0500
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-17 16:17:48.213370981 -0500
+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");
@@ -48,9 +66,9 @@
  				else if (strcmp(content, "smart") == 0)
  					weightedPredPFrames = X264_WEIGHTP_SMART;
  
-diff -Naur 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	2010-09-29 14:48:29.000000000 -0500
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd	2011-04-17 16:19:10.877113040 -0500
+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">


Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- avidemux.spec	24 Apr 2011 12:23:08 -0000	1.43
+++ avidemux.spec	24 Apr 2011 14:34:56 -0000	1.44
@@ -297,9 +297,13 @@
 %{_includedir}/ADM_coreConfig.h
 
 %changelog
+* Sun Apr 24 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-6
+- Really fix AAC this time.
+- Really fix x264 this time.
+
 * Sun Apr 24 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-5
-- AAC encoding now working. (Kevin Kolfer)
-- Fedora 15 build dependecy fixed. (Kevin Kolfer)
+- AAC encoding now working. (Kevin Kofler)
+- Fedora 15 build dependecy fixed. (Kevin Kofler)
 - Audio device peferences now remembered.
 
 * Wed Apr 20 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-4

avidemux_2.5.4-ffmpeg-aac.patch:
 cmake/admFFmpegBuild.cmake                                   |    2 -
 plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt            |    9 ++++
 plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp |   21 ++++++++---
 3 files changed, 26 insertions(+), 6 deletions(-)

Index: avidemux_2.5.4-ffmpeg-aac.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux_2.5.4-ffmpeg-aac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avidemux_2.5.4-ffmpeg-aac.patch	16 Apr 2011 23:38:04 -0000	1.1
+++ avidemux_2.5.4-ffmpeg-aac.patch	24 Apr 2011 14:34:56 -0000	1.2
@@ -71,3 +71,15 @@
 +	INIT_AUDIO_ENCODER(ADM_ae_lav_aac)
 +	INSTALL_AUDIOENCODER(ADM_ae_lav_aac)
 
+diff -Naur avidemux_2.5.4.orig/cmake/admFFmpegBuild.cmake avidemux_2.5.4/cmake/admFFmpegBuild.cmake
+--- avidemux_2.5.4.orig/cmake/admFFmpegBuild.cmake	2010-09-05 06:42:43.000000000 -0500
++++ avidemux_2.5.4/cmake/admFFmpegBuild.cmake	2011-04-21 21:03:21.512707903 -0500
+@@ -10,7 +10,7 @@
+ set(FFMPEG_DECODERS  adpcm_ima_amv  amv  bmp  cinepak  cyuv  dca  dvbsub  dvvideo  ffv1  ffvhuff  flv  fraps  h263  h264  huffyuv  mjpeg
+ 					 mjpegb  mpeg2video  mpeg4  msmpeg4v2  msmpeg4v3  msvideo1  nellymoser  png  qdm2  rawvideo  snow  svq3  theora  tscc
+ 					 vc1  vp3  vp6  vp6a  vp6f  wmav2  wmv1  wmv2  wmv3)
+-set(FFMPEG_ENCODERS  ac3  dvvideo  ffv1  ffvhuff  flv  h263  huffyuv  mjpeg  mp2  mpeg1video  mpeg2video  mpeg4  snow)
++set(FFMPEG_ENCODERS  ac3  aac  dvvideo  ffv1  ffvhuff  flv  h263  huffyuv  mjpeg  mp2  mpeg1video  mpeg2video  mpeg4  snow)
+ set(FFMPEG_MUXERS  flv  matroska  mpeg1vcd  mpeg2dvd  mpeg2svcd  mpegts  mov  mp4  psp)
+ set(FFMPEG_PARSERS  ac3  h263  h264  mpeg4video)
+ set(FFMPEG_PROTOCOLS  file)

More information about the rpmfusion-commits mailing list