From 01850ecdcc3c085240377f3de1883766f1b114a9 Mon Sep 17 00:00:00 2001
From: Luis de Bethencourt <luis.debethencourt@collabora.com>
Date: Tue, 12 Jul 2011 12:36:05 +0200
Subject: core,doc: Make AAC_ISO_320 transcoder configurable

---
 doc/man/rygel.conf.xml | 10 ++++++++++
 doc/man/rygel.xml      | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+)

(limited to 'doc/man')

diff --git a/doc/man/rygel.conf.xml b/doc/man/rygel.conf.xml
index 1d702606..9036aae2 100644
--- a/doc/man/rygel.conf.xml
+++ b/doc/man/rygel.conf.xml
@@ -185,6 +185,16 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>enable-aac-transcoder</option>
+        </term>
+        <listitem>
+          <para>
+            Set to <userinput>true</userinput> to enable transcoding to AAC.
+          </para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <option>log-level=<replaceable>DOMAIN</replaceable>:<replaceable>LEVEL</replaceable>[,<replaceable>DOMAIN</replaceable>:<replaceable>LEVEL</replaceable>,…]</option>
diff --git a/doc/man/rygel.xml b/doc/man/rygel.xml
index 12afd400..8d42ee9b 100644
--- a/doc/man/rygel.xml
+++ b/doc/man/rygel.xml
@@ -220,6 +220,17 @@ handling.</para>
           <para>Disable transcoding to WMV.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>-a</option>
+        </term>
+        <term>
+          <option>--disable-aac-transcoder</option>
+        </term>
+        <listitem>
+          <para>Disable transcoding to AAC.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <option>-U</option>
@@ -428,6 +439,14 @@ handling.</para>
           <para>Disable transcoding to WMV format.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>RYGEL_DISABLE_AAC_TRANS</envar>
+        </term>
+        <listitem>
+          <para>Disable transcoding to AAC format.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <envar>RYGEL_LOG</envar>
-- 
cgit v1.2.1