From: Dan Dennedy <dan@dennedy.org>
Date: Wed, 16 Sep 2009 03:38:36 +0000 (+0000)
Subject: New versions of FFmpeg are likely not to have libfaac since it requires
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=cd936cb2cfe0c262402b66ad76d787a04824192b;p=kdenlive

New versions of FFmpeg are likely not to have libfaac since it requires
--enable-nonfree, and a native AAC encoder is available since July 8,
2009.

svn path=/trunk/kdenlive/; revision=3895
---

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index 1b2d53f9..f3ec0892 100644
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -794,7 +794,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const
         if (m_view.open_dvd->isChecked()) {
             renderItem->setData(0, Qt::UserRole, group);
             if (renderArgs.contains("profile=")) {
-                // rendering profile contains an MLT profile, so pass it to the running jog item, useful for dvd
+                // rendering profile contains an MLT profile, so pass it to the running jog item, useful for dvd
                 QString prof = renderArgs.section("profile=", 1, 1);
                 prof = prof.section(' ', 0, 0);
                 kDebug() << "// render profile: " << prof;
@@ -804,7 +804,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const
     } else {
         if (group == "websites" && m_view.open_browser->isChecked()) {
             renderItem->setData(0, Qt::UserRole, group);
-            // pass the url
+            // pass the url
             QString url = m_view.size_list->currentItem()->data(ExtraRole).toString();
             renderItem->setData(0, Qt::UserRole + 1, url);
         }
@@ -1154,6 +1154,8 @@ void RenderWidget::parseFile(QString exportFile, bool editable)
     const QStringList acodecsList = KdenliveSettings::audiocodecs();
     bool replaceVorbisCodec = false;
     if (!acodecsList.contains("vorbis") && acodecsList.contains("libvorbis")) replaceVorbisCodec = true;
+	bool replaceLibfaacCodec = false;
+	if (!acodecsList.contains("libfaac") && acodecsList.contains("aac")) replaceLibfaacCodec = true;
 
 
     if (editable || groups.count() == 0) {
@@ -1207,7 +1209,10 @@ void RenderWidget::parseFile(QString exportFile, bool editable)
                 // replace vorbis with libvorbis
                 params = params.replace("vorbis", "libvorbis");
             }
-
+			if (replaceLibfaacCodec && params.contains("acodec=libfaac")) {
+				// replace libfaac with aac
+				params = params.replace("libfaac", "aac");
+			}
 
             QString category = profile.attribute("category", i18n("Custom"));
             QString dest = profile.attribute("destinationid");