From d61686dad21d4ca9d0eb83a493e7138fbf55f046 Mon Sep 17 00:00:00 2001
From: Luis de Bethencourt <luis.debethencourt@collabora.com>
Date: Tue, 19 Jul 2011 12:04:57 +0200
Subject: core,doc: Make AVC_MP4 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 9036aae2..a5c33942 100644
--- a/doc/man/rygel.conf.xml
+++ b/doc/man/rygel.conf.xml
@@ -195,6 +195,16 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>enable-avc-transcoder</option>
+        </term>
+        <listitem>
+          <para>
+            Set to <userinput>true</userinput> to enable transcoding to AVC.
+          </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 8d42ee9b..a37e8002 100644
--- a/doc/man/rygel.xml
+++ b/doc/man/rygel.xml
@@ -231,6 +231,17 @@ handling.</para>
           <para>Disable transcoding to AAC.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>-z</option>
+        </term>
+        <term>
+          <option>--disable-avc-transcoder</option>
+        </term>
+        <listitem>
+          <para>Disable transcoding to AVC.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <option>-U</option>
@@ -447,6 +458,14 @@ handling.</para>
           <para>Disable transcoding to AAC format.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>RYGEL_DISABLE_AVC_TRANS</envar>
+        </term>
+        <listitem>
+          <para>Disable transcoding to AVC format.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <envar>RYGEL_LOG</envar>
-- 
cgit v1.2.1