Author: hobbes1069 Update of /cvs/free/rpms/avidemux/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv25054 Added Files: avidemux_2.5.4-ffmpeg-aac.patch Log Message: Forgot new patch. avidemux_2.5.4-ffmpeg-aac.patch: CMakeLists.txt | 9 +++++++++ audioencoder_lavcodec.cpp | 21 ++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) --- NEW FILE avidemux_2.5.4-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)