rpms/avidemux/devel avidemux-2.5.5-gcc46_tmp_fix.patch, NONE, 1.1 avidemux-2.5.5_fix_lav_audio_encoder.patch, NONE, 1.1 avidemux_2.5.5-ffmpeg_aac.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 avidemux.spec, 1.48, 1.49 sources, 1.8, 1.9

Richard Shaw hobbes1069 at rpmfusion.org
Mon Jun 27 16:09:12 CEST 2011


Author: hobbes1069

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

Modified Files:
	.cvsignore avidemux.spec sources 
Added Files:
	avidemux-2.5.5-gcc46_tmp_fix.patch 
	avidemux-2.5.5_fix_lav_audio_encoder.patch 
	avidemux_2.5.5-ffmpeg_aac.patch 
Log Message:
* Sun Jun 05 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.5-1
- New release: 2.5.5
- FFMpeg based AAC encoding is broken (BZ#1825) and
  will be disabled until fixed.


avidemux-2.5.5-gcc46_tmp_fix.patch:
 avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp                     |   11 +++-------
 avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h                       |    2 -
 plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp |    8 ++-----
 plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h   |    2 -
 plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp |    8 ++-----
 plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h   |    2 -
 6 files changed, 13 insertions(+), 20 deletions(-)

--- NEW FILE avidemux-2.5.5-gcc46_tmp_fix.patch ---
diff -Naur avidemux_2.5.5.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp avidemux_2.5.5/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp
--- avidemux_2.5.5.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp	2011-04-23 14:56:47.000000000 -0500
+++ avidemux_2.5.5/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp	2011-06-06 08:36:43.093745534 -0500
@@ -138,7 +138,7 @@
 		*configType = (ConfigMenuType)combobox->itemData(combobox->currentIndex()).toInt();
 	}
 
-	bool ADM_QconfigMenu::selectConfiguration(QString *selectFile, ConfigMenuType configurationType)
+	bool ADM_QconfigMenu::selectConfiguration(const QString &selectFile, ConfigMenuType configurationType)
 	{
 		bool success = false;
 		bool origDisableGenericSlots = disableGenericSlots;
@@ -210,8 +210,7 @@
 				delete [] configData;
 
 				fillConfigurationComboBox();
-				QString qs=QFileInfo(configFileName).completeBaseName();
-				selectConfiguration(&qs, CONFIG_MENU_USER);
+				selectConfiguration(QFileInfo(configFileName).completeBaseName(), CONFIG_MENU_USER);
 			}
 		}
 	}
@@ -316,8 +315,7 @@
 	void diaElemConfigMenu::updateMe(void)
 	{
 		ADM_QconfigMenu *configMenu = (ADM_QconfigMenu*)myWidget;
-		QString qs=QString(configName);
-		configMenu->selectConfiguration(&qs, *configType);
+		configMenu->selectConfiguration(QString(configName), *configType);
 	}
 
 	void diaElemConfigMenu::finalize(void)
@@ -356,8 +354,7 @@
 				while (parentWidget != NULL);
 			}
 		}
-		QString qs=QString(configName);
-		configMenu->selectConfiguration(&(qs), *configType);
+		configMenu->selectConfiguration(QString(configName), *configType);
 	}
 }
 
diff -Naur avidemux_2.5.5.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h avidemux_2.5.5/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h
--- avidemux_2.5.5.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h	2009-07-30 13:38:30.000000000 -0500
+++ avidemux_2.5.5/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h	2011-06-06 08:30:50.336250102 -0500
@@ -46,7 +46,7 @@
 		~ADM_QconfigMenu();
 
 		void getConfiguration(char *configName, ConfigMenuType *configType);
-		bool selectConfiguration(QString *selectFile, ConfigMenuType configurationType);
+		bool selectConfiguration(const QString &selectFile, ConfigMenuType configurationType);
 	};
 }
 #endif	// T_configMenu_h
diff -Naur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
--- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2011-04-23 14:56:49.000000000 -0500
+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2011-06-06 08:44:49.739870167 -0500
@@ -216,7 +216,7 @@
 	disableGenericSlots = origDisableGenericSlots;
 }
 
-bool x264ConfigDialog::selectConfiguration(QString *selectFile, PluginConfigType configurationType)
+bool x264ConfigDialog::selectConfiguration(const QString &selectFile, PluginConfigType configurationType)
 {
 	bool success = false;
 	bool origDisableGenericSlots = disableGenericSlots;
@@ -350,8 +350,7 @@
 		delete [] xml;
 
 		fillConfigurationComboBox();
-		QString qs=QFileInfo(configFileName).completeBaseName();
-		selectConfiguration(&qs, PLUGIN_CONFIG_USER);
+		selectConfiguration(QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);
 	}
 
 	delete [] configDirectory;
@@ -587,8 +586,7 @@
 
 	disableGenericSlots = true;
 	options->getPresetConfiguration(&configurationName, &configurationType);
-	QString qs=QString(configurationName);
-	bool foundConfig = selectConfiguration(&qs, configurationType);
+	bool foundConfig = selectConfiguration(QString(configurationName), configurationType);
 
 	if (!foundConfig)
 		printf("Configuration %s (type %d) could not be found.  Using snapshot.\n", configurationName, configurationType);
diff -Naur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h
--- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h	2010-09-29 15:20:48.000000000 -0500
+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h	2011-06-06 08:30:50.339250103 -0500
@@ -46,7 +46,7 @@
 	uint8_t intra8x8Luma[64], inter8x8Luma[64];
 
 	void fillConfigurationComboBox(void);
-	bool selectConfiguration(QString *selectFile, PluginConfigType configurationType);
+	bool selectConfiguration(const QString &selectFile, PluginConfigType configurationType);
 	bool loadPresetSettings(vidEncOptions *encodeOptions, x264Options *options);
 	void loadSettings(vidEncOptions *encodeOptions, x264Options *options);
 	int getValueIndexInArray(uint8_t value, const uint8_t valueArray[], int elementCount);
diff -Naur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp
--- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp	2011-04-30 07:49:07.000000000 -0500
+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp	2011-06-06 08:41:31.901324879 -0500
@@ -129,7 +129,7 @@
 	disableGenericSlots = origDisableGenericSlots;
 }
 
-bool XvidConfigDialog::selectConfiguration(QString *selectFile, PluginConfigType configurationType)
+bool XvidConfigDialog::selectConfiguration(const QString &selectFile, PluginConfigType configurationType)
 {
 	bool success = false;
 	bool origDisableGenericSlots = disableGenericSlots;
@@ -234,8 +234,7 @@
 
 		fillConfigurationComboBox();
 
-                QString qs=QFileInfo(configFileName).completeBaseName();
-		selectConfiguration(&qs, PLUGIN_CONFIG_USER);
+		selectConfiguration(QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);
 	}
 
 	delete [] configDirectory;
@@ -375,8 +374,7 @@
 	disableGenericSlots = true;
 	options->getPresetConfiguration(&configurationName, &configurationType);		
 
-        QString qs=QString(configurationName);
-	bool foundConfig = selectConfiguration(&qs, configurationType);
+	bool foundConfig = selectConfiguration(QString(configurationName), configurationType);
 
 	if (!foundConfig)
 		printf("Configuration %s (type %d) could not be found.  Using snapshot.\n", configurationName, configurationType);
diff -Naur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h
--- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h	2009-08-03 11:24:09.000000000 -0500
+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h	2011-06-06 08:30:50.341250092 -0500
@@ -26,7 +26,7 @@
 	unsigned char intraMatrix[64], interMatrix[64];
 
 	void fillConfigurationComboBox(void);
-	bool selectConfiguration(QString *selectFile, PluginConfigType configurationType);
+	bool selectConfiguration(const QString &selectFile, PluginConfigType configurationType);
 	bool loadPresetSettings(vidEncOptions *encodeOptions, XvidOptions *options);
 	void loadSettings(vidEncOptions *encodeOptions, XvidOptions *options);
 

avidemux-2.5.5_fix_lav_audio_encoder.patch:
 audioencoder_lavcodec.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE avidemux-2.5.5_fix_lav_audio_encoder.patch ---
diff --git a/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp b/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp
index be265c1..39f14e6 100644
--- a/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp
+++ b/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp
@@ -144,6 +144,8 @@ uint8_t AUDMEncoder_Lavcodec::initialize(void)
   CONTEXT->channels     =  _wavheader->channels;
   CONTEXT->sample_rate  =  _wavheader->frequency;
   CONTEXT->bit_rate     = (lavConfig.bitrate*1000); // bits -> kbits
+  CONTEXT->sample_fmt=AV_SAMPLE_FMT_S16;
+  CONTEXT->request_sample_fmt=AV_SAMPLE_FMT_S16;
 
   AVCodec *codec;
   CodecID codecID;

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

--- NEW FILE avidemux_2.5.5-ffmpeg_aac.patch ---
diff -ur avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp avidemux_2.5.4-ffmpeg-aac/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp
--- avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp.ffmpegaac	2010-05-25 16:48:57.000000000 -0400
+++ avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp	2010-11-20 16:26:36.756237795 -0500
@@ -25,13 +25,16 @@
 #include "ADM_lavcodec.h"
 
 #define Join(x,y) x##_##y
-#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3)
+#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC)
   #define makeName(x) Join(x,MP2)
   #define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_MP2
 #else
- #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3)
+ #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC)
   #define makeName(x) Join(x,AC3)
   #define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AC3
+ #elif !defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && defined(ADM_LAV_AAC)
+  #define makeName(x) Join(x,AAC)
+  #define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AAC
  #else
    #error
  #endif
@@ -60,13 +63,19 @@
   2,                    // Max channels
   1,0,0,                // Version
 #else
-  
-
+#ifdef ADM_LAV_AC3
  "LavAC3",            
   "AC3 (lav)",      
   "AC3 LavEncoder encoder plugin Mean 2008",             
   6,                    // Max channels
   1,0,0,                // Version
+#else
+ "LavAAC",
+  "AAC (lav)",
+  "AAC LavEncoder encoder plugin Mean 2008",
+  6,                    // Max channels
+  1,0,0,                // Version
+#endif
 #endif
   makeName(WAV),
 
@@ -132,7 +141,9 @@
 #endif
   _wavheader->byterate=(lavConfig.bitrate*1000)>>3;         
       
-#ifdef ADM_LAV_MP2 
+#if defined(ADM_LAV_AAC)
+    _chunk = 1024*_wavheader->channels;
+#elif defined(ADM_LAV_MP2)
     _chunk = 1152*_wavheader->channels;
 #else
     _chunk = 1536*_wavheader->channels; // AC3

diff -ur avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt avidemux_2.5.4-ffmpeg-aac/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt
--- avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt.ffmpegaac	2010-05-25 16:48:57.000000000 -0400
+++ avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt	2010-11-20 16:24:10.171164293 -0500
@@ -27,3 +27,12 @@
 
 	INIT_AUDIO_ENCODER(ADM_ae_lav_ac3)
 	INSTALL_AUDIOENCODER(ADM_ae_lav_ac3)
+
+	SET(ADM_ae_lav_aac_SRCS audioencoder_lavcodec.cpp)
+
+	ADD_LIBRARY(ADM_ae_lav_aac SHARED ${ADM_ae_lav_aac_SRCS})
+	ADD_TARGET_CFLAGS(ADM_ae_lav_aac "-DADM_LAV_AAC")
+	TARGET_LINK_LIBRARIES(ADM_ae_lav_aac ADM_core ADM_coreAudio ADM_coreUI ADM_libavcodec ADM_libavutil)
+
+	INIT_AUDIO_ENCODER(ADM_ae_lav_aac)
+	INSTALL_AUDIOENCODER(ADM_ae_lav_aac)

diff -Naur avidemux_2.5.5.orig/cmake/admFFmpegBuild.cmake avidemux_2.5.5/cmake/admFFmpegBuild.cmake
--- avidemux_2.5.5.orig/cmake/admFFmpegBuild.cmake	2011-05-11 12:54:15.000000000 -0500
+++ avidemux_2.5.5/cmake/admFFmpegBuild.cmake	2011-06-05 11:37:00.054112231 -0500
@@ -14,7 +14,7 @@
 set(FFMPEG_DECODERS  adpcm_ima_amv  amv  bmp  cinepak  cyuv  dca  dvbsub  dvvideo  ffv1  ffvhuff  flac  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  ac3_fixed  ac3_float  dvvideo  ffv1  ffvhuff  flv  h263  huffyuv  mjpeg  mp2  mpeg1video  mpeg2video  mpeg4  snow)
+set(FFMPEG_ENCODERS  aac ac3  ac3_fixed  ac3_float  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)


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Apr 2011 23:50:00 -0000	1.8
+++ .cvsignore	27 Jun 2011 14:09:09 -0000	1.9
@@ -1,2 +1 @@
-avidemux_2.5.3.tar.gz
-avidemux.spec.old
+avidemux_2.5.5.tar.gz


Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- avidemux.spec	4 Jun 2011 12:33:21 -0000	1.48
+++ avidemux.spec	27 Jun 2011 14:09:09 -0000	1.49
@@ -1,8 +1,8 @@
 %define _pkgbuilddir %{_builddir}/%{name}_%{version}
 
 Name:           avidemux
-Version:        2.5.4
-Release:        9%{?dist}
+Version:        2.5.5
+Release:        1%{?dist}
 Summary:        Graphical video editing and transcoding tool
 
 Group:          Applications/Multimedia
@@ -38,18 +38,16 @@
 Patch4:         avidemux-2.5.3-mpeg2enc.patch
 Patch5:         avidemux-2.5.3-pluginlibs.patch
 # Patch8 obtained from http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2010-October/008645.html
-Patch6:         avidemux_2.5.4-ffmpeg-aac.patch
-Patch7:         avidemux-2.5.4-gcc46_tmp_fix.patch
-Patch8:         avidemux-2.5.4-gtk_menu_crash_fix.patch
+#Patch6:         avidemux_2.5.4-ffmpeg-aac.patch
+Patch6:         avidemux_2.5.5-ffmpeg_aac.patch
+Patch7:         avidemux-2.5.5-gcc46_tmp_fix.patch
 # Patch needed for version of x264 in F15/rawhide.
-Patch9:         avidemux-2.5.4-x264_fix.patch
-Patch10:        avidemux-2.5.4-audio_prefs.patch
-Patch11:        avidemux-2.5.4-ffmpeg_perms.patch
 # Use system libraries
-Patch12:        avidemux-2.5.4-libass.patch
-Patch13:        avidemux-2.5.4-liba52.patch
-Patch14:        avidemux-2.5.4-libmad.patch
-Patch15:        avidemux-2.5.4-libtwolame.patch
+Patch8:         avidemux-2.5.4-libass.patch
+Patch9:         avidemux-2.5.4-liba52.patch
+Patch10:        avidemux-2.5.4-libmad.patch
+Patch11:        avidemux-2.5.4-libtwolame.patch
+Patch12:        avidemux-2.5.5_fix_lav_audio_encoder.patch
 # Uses a header file not found in the standard package
 #Patch16:        avidemux-2.5.4-mpeg2enc.patch
 
@@ -179,7 +177,9 @@
 %setup -q -n avidemux_%{version}
 
 # Remove unneeded external libraries
-#rm -rf avidemux/ADM_libraries/ADM_smjs
+%if 0%{?fedora} <= 15
+rm -rf avidemux/ADM_libraries/ADM_smjs
+%endif
 rm -rf plugins/ADM_videoFilters/Ass/ADM_libAss
 rm -rf plugins/ADM_audioEncoders/twolame/ADM_libtwolame
 rm -rf plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad
@@ -192,7 +192,7 @@
 sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/main.cpp
 %endif
 
-# Fix build with version of js introduced in F15.
+# Fix build with js 1.8.5 introduced in F15.
 #find avidemux/ADM_script -name '*.h' -exec \
 #sed -i -e '/#include "jsapi.h"/ i\
 ##undef malloc \
@@ -206,24 +206,25 @@
 %patch3 -p1 -b .tmplinktarget
 %patch4 -p1 -b .mpeg2enc
 %patch5 -p1 -b .pluginlibs
-%patch6 -p1 -b .ffmpegaac
+#%patch6 -p1 -b .ffmpegaac
 %patch7 -p1 -b .gcc46tmpfix
-%patch8 -b .gtk_menu
-%patch9 -p1 -b .x264fix
-%patch10 -p1 -b .audioprefs
-%patch11 -p1 -b .ffmpegperms
-%patch12 -p1 -b .libass
-%patch13 -p1 -b .liba52
-%patch14 -p1 -b .libmad
-%patch15 -p1 -b .libtwolame
-#%patch16 -p1 -b .mpeg2enc
+%patch8 -p1 -b .libass
+%patch9 -p1 -b .liba52
+%patch10 -p1 -b .libmad
+%patch11 -p1 -b .libtwolame
+%patch12 -p1 -b .lavencode
 
 
 %build
 # Cmake requires out of source build
 mkdir -p build && pushd build
+%if 0%{?fedora} <= 15
+%cmake -DUSE_SYSTEM_SPIDERMONKEY:BOOL=ON \
+%else
 %cmake -DUSE_SYSTEM_SPIDERMONKEY:BOOL=OFF \
+%endif
        ..
+
 make %{?_smp_mflags}
 # Create the temp link directory manually since otherwise it happens too early
 mkdir -p %{_pkgbuilddir}/build/%{_lib}
@@ -320,6 +321,11 @@
 %{_includedir}/ADM_coreConfig.h
 
 %changelog
+* Sun Jun 05 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.5-1
+- New release: 2.5.5
+- FFMpeg based AAC encoding is broken (BZ#1825) and
+  will be disabled until fixed.
+
 * Sat Jun 04 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-9
 - New version of js in Fedora 15 breaks build.
 - Re-enable built-in javascript for Fedora 15.


Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Apr 2011 23:33:22 -0000	1.8
+++ sources	27 Jun 2011 14:09:10 -0000	1.9
@@ -1 +1 @@
-b849460f6480df92bfd72d1a3dc288d4  avidemux_2.5.4.tar.gz
+33bbe210c6826cea1987ed18a41d57a7  avidemux_2.5.5.tar.gz



More information about the rpmfusion-commits mailing list