summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJens Georg <jensg@openismus.org>2012-08-31 15:41:43 +0200
committerJens Georg <jensg@openismus.com>2012-10-05 17:33:28 +0200
commit948ca2c717c68e3acd666d288809230fca07676e (patch)
tree6fb417576d9df7458ebc1cf51fd49328a15fa929 /data
parent6a21745ce346dde83e714b77f9fb1fea4a5da1dd (diff)
downloadrygel-948ca2c717c68e3acd666d288809230fca07676e.tar.gz
core,data,doc: Drop transcoder options
Add a new [MediaEngine] section and add a "transcoders" list.
Diffstat (limited to 'data')
-rw-r--r--data/rygel.conf26
1 files changed, 7 insertions, 19 deletions
diff --git a/data/rygel.conf b/data/rygel.conf
index 2a259ad0..61832b7b 100644
--- a/data/rygel.conf
+++ b/data/rygel.conf
@@ -13,25 +13,6 @@ upnp-enabled=true
# Set it to 'false' if you want to disable transcoding support.
enable-transcoding=true
-# Set it to 'false' if you want to disable MP3 transcoding support.
-enable-mp3-transcoder=true
-
-# Set it to 'false' if you want to disable LPCM transcoding support.
-enable-lpcm-transcoder=true
-
-# Set it to 'false' if you want to disable mpeg transport stream
-# (mpeg 2 video + audio) transcoding support.
-enable-mp2ts-transcoder=true
-
-# Set it to 'false' if you want to disable WMV transcoding support.
-enable-wmv-transcoder=true
-
-# Set it to 'false' if you want to disable AAC_ADTS_320 transcoding support.
-enable-aac-transcoder=true
-
-# Set it to 'false' if you want to disable AVC_MP4 transcoding support.
-enable-avc-transcoder=true
-
# Where video files should be saved if allow-upload is true.
# Defaults to @VIDEOS@, the standard videos folder (typically ${HOME}/Videos).
video-upload-folder=@VIDEOS@
@@ -93,6 +74,13 @@ allow-deletion=true
# returned by g_get_host_name() function of glib library.
#
+# Options related to the used media backend.
+# The options shown in this configuration file are specific to GStreamer.
+[MediaEngine]
+
+# List of active transcoders. To disable one, remove from list.
+transcoders=mp3;lpcm;mp2ts;wmv;aac;avc
+
[Tracker]
enabled=true
share-pictures=true