Skip to content
Browse files

continue previous commit

  • Loading branch information...
1 parent 3e8798e commit 4240de6c94c050e676ef8e9df8f36172cecc6bb0 @chocolateboy chocolateboy committed Nov 27, 2012
Showing with 7 additions and 7 deletions.
  1. +7 −7 src/main/external-resources/PMS.conf
View
14 src/main/external-resources/PMS.conf
@@ -379,16 +379,17 @@ key_sort_method =
# Default: empty.
folders =
-
# ----------------------------------------------------------------------------
# Transcoder Settings
# ----------------------------------------------------------------------------
# Transcoder engines
# GUI Option: Ordered list of engines (selector)
# System generates list of available engines, list depends on host.
+# XXX Can be empty, which overrides the default value.
# Default: "mencoder,avsmencoder,tsmuxer,ffmpegvideo,ffmpegaudio,mplayeraudio,tsmuxeraudio,ffmpegwebvideo,vlcvideo,mencoderwebvideo,mplayervideodump,mplayerwebaudio,vlcaudio,ffmpegdvrmsremux,rawthumbs"
-engines =
+
+# engines =
# ----------------------------------------------------------------------------
# Transcoding Settings: Common settings
@@ -508,7 +509,6 @@ mencoder_disablesubs =
# Default: empty.
notranscode =
-
# Force transcode for extensions
# ------------------------------
# GUI Option: Force transcode for extensions (list)
@@ -589,7 +589,7 @@ mencoder_decode =
# GUI Option: Audio language priority (list)
# A comma-separated list of language codes that defines the priority for
# MEncoder when choosing audio languages, where "und" stands for "undefined".
-# XXX Can be empty, which pre-empts the default value.
+# XXX Can be empty, which overrides the default value.
# Default: a localized list (e.g. "eng,fre,jpn,ger,und").
# mencoder_audiolangs =
@@ -601,15 +601,15 @@ mencoder_decode =
# GUI Option: Subtitle language priority (list)
# A comma-separated list of language codes that defines the priority for
# MEncoder when choosing subtitle languages, where "und" stands for "undefined".
-# XXX Can be empty, which pre-empts the default value.
+# XXX Can be empty, which overrides the default value.
# Default: a localized list (e.g. "eng,fre,jpn,ger,und").
# mencoder_sublangs =
# Force subtitle language
# -----------------------
# GUI Option: Force subtitle language (string)
-# XXX Can be empty, which pre-empts the default value.
+# XXX Can be empty, which overrides the default value.
# Default: the value of the language option, or "en".
# forced_sub_lang =
@@ -630,7 +630,7 @@ forced_sub_tags =
# subtitle language should be comma separated as a pair; individual pairs
# should be semicolon separated. "*" can be used to match any language.
# Subtitle language can be defined as "off" (e.g. "jpn,off;*,*").
-# XXX Can be empty, which pre-empts the default value.
+# XXX Can be empty, which overrides the default value.
# Default: a localized list (usually "*,*").
# mencoder_audiosublangs =

0 comments on commit 4240de6

Please sign in to comment.
Something went wrong with that request. Please try again.