Author: hobbes1069 Update of /cvs/free/rpms/avidemux/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv8029 Modified Files: avidemux.spec Added Files: avidemux-2.5.6-ffmpeg_aac.patch Log Message: * Fri Jan 27 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.6-2 - Attempt to fix FFmpeg based AAC encoding. avidemux-2.5.6-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(-) --- NEW FILE avidemux-2.5.6-ffmpeg_aac.patch --- diff -Naur avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake avidemux_2.5.6/cmake/admFFmpegBuild.cmake --- avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake 2012-01-27 15:05:15.029793577 -0600 +++ avidemux_2.5.6/cmake/admFFmpegBuild.cmake 2012-01-27 15:06:00.663291081 -0600 @@ -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_fixed dvvideo ffv1 ffvhuff flv h263 huffyuv mjpeg mp2 mpeg1video mpeg2video mpeg4 snow) +set(FFMPEG_ENCODERS aac ac3_fixed 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) diff -Naur avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp --- avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2011-12-28 08:51:49.000000000 -0600 +++ avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2012-01-27 15:05:39.672982290 -0600 @@ -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 -Naur avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt --- avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2010-05-25 15:48:57.000000000 -0500 +++ avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2012-01-27 15:05:39.673982248 -0600 @@ -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) Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- avidemux.spec 27 Jan 2012 17:01:04 -0000 1.57 +++ avidemux.spec 28 Jan 2012 15:30:25 -0000 1.58 @@ -2,7 +2,7 @@ Name: avidemux Version: 2.5.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia @@ -14,7 +14,7 @@ Source2: %{name}-qt.desktop # Patch0 obtained from avidemux-2.5.0-patches-1.tar.bz2: # http://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/avidemux-2.5... -#Patch0: avidemux-2.5.6-parallel_build.patch +Patch0: avidemux-2.5.6-parallel_build.patch Patch1: avidemux-2.5-pulseaudio-default.patch Patch2: avidemux-2.4-qt4.patch # Prevents avidemux from creating the symlinks for .so files, which we do below @@ -25,7 +25,7 @@ Patch5: avidemux-2.5.3-pluginlibs.patch # Patch8 obtained from http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2010-October/00... #Patch6: avidemux_2.5.4-ffmpeg-aac.patch -Patch6: avidemux_2.5.5-ffmpeg_aac.patch +Patch6: avidemux-2.5.6-ffmpeg_aac.patch Patch7: avidemux-2.5.5-gcc46_tmp_fix.patch # Patch needed for version of x264 in F15/rawhide. # Use system libraries @@ -183,7 +183,7 @@ %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 -p1 -b .libass %patch9 -p1 -b .liba52 @@ -315,6 +315,9 @@ %changelog +* Fri Jan 27 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.6-2 +- Attempt to fix FFmpeg based AAC encoding. + * Wed Jan 25 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.6-1 - Update to latest release.