Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfilescreated-generic

Conflicts:
	.alsa.full
	.crontab
	.crontab.local
	.wmii/wmiirc.local
	.xmodmap

15 files changed, 2052 insertions, 1950 deletions

diff --git a/.config/vlc/vlc-qt-interface.conf b/.config/vlc/vlc-qt-interface.conf
index 1256a0a..c37e2ec 100644
--- a/.config/vlc/vlc-qt-interface.conf
+++ b/.config/vlc/vlc-qt-interface.conf
@@ -2,7 +2,7 @@
 IsFirstRun=0
 filedialog-path=/home/luke/kdenlive
 opendialog-size=@Size(526 490)
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x4\xff\0\0\0W\0\0\0\x1\0\0\0\x10\0\0\x4\xfe\0\0\0V\0\0\0\0\0\0)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\x1\0\0\0\x10\0\0\a~\0\0\x4&\0\0\0\x1\0\0\0\x10\0\0\a~\0\0\x4&\0\0\0\0\0\0)
 
 [FullScreen]
 pos=@Point(112 696)
diff --git a/.config/vlc/vlcrc b/.config/vlc/vlcrc
index 2e0fc10..2b6e2a3 100644
--- a/.config/vlc/vlcrc
+++ b/.config/vlc/vlcrc
@@ -1,97 +1,129 @@
 ###
-###  vlc 2.0.0
+###  vlc 2.0.1
 ###
 
 ###
 ### lines beginning with a '#' character are comments
 ###
 
-[access_output_livehttp] # HTTP Live streaming output
+[audioscrobbler] # Submission of played songs to last.fm
 
-# Segment length (integer)
-#sout-livehttp-seglen=10
+# Username (string)
+#lastfm-username=
 
-# Number of segments (integer)
-#sout-livehttp-numsegs=0
+# Password (string)
+#lastfm-password=
 
-# Split segments anywhere (boolean)
-#sout-livehttp-splitanywhere=0
+# Scrobbler URL (string)
+#scrobbler-url=post.audioscrobbler.com
 
-# Delete segments (boolean)
-#sout-livehttp-delsegs=1
+[gnutls] # GNU TLS transport layer security
 
-# Use muxers rate control mechanism (boolean)
-#sout-livehttp-ratecontrol=0
+# TLS cipher priorities (string)
+#gnutls-priorities=NORMAL
 
-# Index file (string)
-#sout-livehttp-index=
+[logger] # File logging
 
-# Full URL to put in index file (string)
-#sout-livehttp-index-url=
+# Log filename (string)
+#logfile=
 
-[access_output_http] # HTTP stream output
+# Log format (string)
+#logmode=text
 
-# Username (string)
-#sout-http-user=
+# Syslog facility (string)
+#syslog-facility=user
 
-# Password (string)
-#sout-http-pwd=
+# Verbosity (integer)
+#log-verbose=-1
 
-# Mime (string)
-#sout-http-mime=
+[vod_rtsp] # RTSP VoD server
 
-[access_output_udp] # UDP stream output
+# MUX for RAW RTSP transport (string)
+#rtsp-raw-mux=ts
 
-# Caching value (ms) (integer)
-#sout-udp-caching=300
+# Maximum number of connections (integer)
+#rtsp-throttle-users=0
 
-# Group packets (integer)
-#sout-udp-group=1
+# Sets the timeout option in the RTSP session string (integer)
+#rtsp-session-timeout=5
 
-[access_output_file] # File stream output
+[svg] # svg
 
-# Append to file (boolean)
-#sout-file-append=0
+# SVG template file (string)
+#svg-template-file=
 
-# Synchronous writing (boolean)
-#sout-file-sync=0
+[freetype] # Freetype2 font renderer
 
-[access_output_shout] # IceCAST output
+# Font (string)
+#freetype-font=Serif Bold
 
-# Stream name (string)
-#sout-shout-name=VLC media player - Live stream
+# Font size in pixels (integer)
+#freetype-fontsize=0
 
-# Stream description (string)
-#sout-shout-description=Live stream from VLC media player
+# Relative font size (integer)
+#freetype-rel-fontsize=16
 
-# Stream MP3 (boolean)
-#sout-shout-mp3=0
+# Text opacity (integer)
+#freetype-opacity=255
 
-# Genre description (string)
-#sout-shout-genre=Alternative
+# Text default color (integer)
+#freetype-color=16777215
 
-# URL description (string)
-#sout-shout-url=http://www.videolan.org/vlc
+# Force bold (boolean)
+#freetype-bold=0
 
-# Bitrate (string)
-#sout-shout-bitrate=
+# Background opacity (integer)
+#freetype-background-opacity=0
 
-# Samplerate (string)
-#sout-shout-samplerate=
+# Background color (integer)
+#freetype-background-color=0
 
-# Number of channels (string)
-#sout-shout-channels=
+# Outline opacity (integer)
+#freetype-outline-opacity=255
 
-# Ogg Vorbis Quality (string)
-#sout-shout-quality=
+# Outline color (integer)
+#freetype-outline-color=0
 
-# Stream public (boolean)
-#sout-shout-public=0
+# Outline thickness (integer)
+#freetype-outline-thickness=4
 
-[mux_mp4] # MP4/MOV muxer
+# Shadow opacity (integer)
+#freetype-shadow-opacity=128
 
-# Create "Fast Start" files (boolean)
-#sout-mp4-faststart=1
+# Shadow color (integer)
+#freetype-shadow-color=0
+
+# Shadow angle (float)
+#freetype-shadow-angle=-45.000000
+
+# Shadow distance (float)
+#freetype-shadow-distance=0.060000
+
+# Use YUVP renderer (boolean)
+#freetype-yuvp=0
+
+[mux_asf] # ASF muxer
+
+# Title (string)
+#sout-asf-title=
+
+# Author (string)
+#sout-asf-author=
+
+# Copyright (string)
+#sout-asf-copyright=
+
+# Comment (string)
+#sout-asf-comment=
+
+# Rating (string)
+#sout-asf-rating=
+
+# Packet Size (integer)
+#sout-asf-packet-size=4096
+
+# Bitrate override (integer)
+#sout-asf-bitrate-override=0
 
 [mux_ts] # TS muxer (libdvbpsi)
 
@@ -110,6 +142,9 @@
 # TS ID (integer)
 #sout-ts-tsid=0
 
+# NET ID (integer)
+#sout-ts-netid=0
+
 # PMT Program numbers (string)
 #sout-ts-program-pmt=
 
@@ -119,6 +154,9 @@
 # Mux PMT (requires --sout-ts-es-id-pid) (string)
 #sout-ts-muxpmt=
 
+# SDT Descriptors (requires --sout-ts-es-id-pid) (string)
+#sout-ts-sdtdesc=
+
 # Data alignment (boolean)
 #sout-ts-alignment=1
 
@@ -158,36 +196,45 @@
 # Packet size in bytes to encrypt (integer)
 #sout-ts-csa-pkt=188
 
-[mux_asf] # ASF muxer
+[mux_mp4] # MP4/MOV muxer
 
-# Title (string)
-#sout-asf-title=
+# Create "Fast Start" files (boolean)
+#sout-mp4-faststart=1
 
-# Author (string)
-#sout-asf-author=
+[mux_ps] # PS muxer
 
-# Copyright (string)
-#sout-asf-copyright=
+# DTS delay (ms) (integer)
+#sout-ps-dts-delay=200
 
-# Comment (string)
-#sout-asf-comment=
+# PES maximum size (integer)
+#sout-ps-pes-max-size=65500
 
-# Rating (string)
-#sout-asf-rating=
+[jack] # JACK audio output
 
-# Packet Size (integer)
-#sout-asf-packet-size=4096
+# Automatically connect to writable clients (boolean)
+#jack-auto-connect=1
 
-# Bitrate override (integer)
-#sout-asf-bitrate-override=0
+# Connect to clients matching (string)
+#jack-connect-regex=system
 
-[mux_ps] # PS muxer
+[oss] # Open Sound System
 
-# DTS delay (ms) (integer)
-#sout-ps-dts-delay=200
+# OSS DSP device (string)
+#oss-audio-device=/dev/dsp
 
-# PES maximum size (integer)
-#sout-ps-pes-max-size=65500
+[aout_file] # File audio output
+
+# Output file (string)
+#audiofile-file=audiofile.wav
+
+# Output format (string)
+#audiofile-format=s16
+
+# Number of output channels (integer)
+#audiofile-channels=0
+
+# Add WAVE header (boolean)
+#audiofile-wav=1
 
 [amem] # Audio memory output
 
@@ -202,1295 +249,1318 @@
 
 [alsa] # ALSA audio output
 
-# ALSA device (string)
+# Audio output device (string)
 #alsa-audio-device=default
 
-[oss] # Open Sound System
+# Audio output channels (integer)
+#alsa-audio-channels=6
 
-# OSS DSP device (string)
-#oss-audio-device=/dev/dsp
+[packetizer_mpegvideo] # MPEG-I/II video packetizer
 
-[portaudio] # PORTAUDIO audio output
+# Sync on Intra Frame (boolean)
+#packetizer-mpegvideo-sync-iframe=0
 
-# Output device (integer)
-#portaudio-audio-device=0
+[netsync] # Network synchronization
 
-[jack] # JACK audio output
+# Network master clock (boolean)
+#netsync-master=0
 
-# Automatically connect to writable clients (boolean)
-#jack-auto-connect=1
+# Master server ip address (string)
+#netsync-master-ip=
 
-# Connect to clients matching (string)
-#jack-connect-regex=system
+# UDP timeout (in ms) (integer)
+#netsync-timeout=500
 
-[aout_file] # File audio output
+[oldrc] # Remote control interface
 
-# Output file (string)
-#audiofile-file=audiofile.wav
+# Show stream position (boolean)
+#rc-show-pos=0
 
-# Output format (string)
-#audiofile-format=s16
+# Fake TTY (boolean)
+#rc-fake-tty=0
 
-# Number of output channels (integer)
-#audiofile-channels=0
+# UNIX socket command input (string)
+#rc-unix=
 
-# Add WAVE header (boolean)
-#audiofile-wav=1
+# TCP command input (string)
+#rc-host=
 
-[stream_out_es] # Elementary stream output
+[motion] # motion control interface
 
-# Output access method (string)
-#sout-es-access=
+# Use the rotate video filter instead of transform (boolean)
+#motion-use-rotate=0
 
-# Output muxer (string)
-#sout-es-mux=
+[dbus] # D-Bus control interface
 
-# Output URL (string)
-#sout-es-dst=
+# Unique DBUS service id (org.mpris.vlc-<pid>) (boolean)
+#dbus-unique-service-id=0
 
-# Audio output access method (string)
-#sout-es-access-audio=
+[hotkeys] # Hotkeys management interface
 
-# Audio output muxer (string)
-#sout-es-mux-audio=
+# MouseWheel up-down axis Control (integer)
+#hotkeys-mousewheel-mode=0
 
-# Audio output URL (string)
-#sout-es-dst-audio=
+[gestures] # Mouse gestures control interface
 
-# Video output access method (string)
-#sout-es-access-video=
+# Motion threshold (10-100) (integer)
+#gestures-threshold=30
 
-# Video output muxer (string)
-#sout-es-mux-video=
+# Trigger button (string)
+#gestures-button=right
 
-# Video output URL (string)
-#sout-es-dst-video=
+[demuxdump] # File dumper
 
-[stream_out_standard] # Standard stream output
+# Dump filename (string)
+#demuxdump-file=stream-demux.dump
 
-# Output access method (string)
-#sout-standard-access=
+# Append to existing file (boolean)
+#demuxdump-append=0
 
-# Output muxer (string)
-#sout-standard-mux=
+[dirac] # Dirac video demuxer
 
-# Output destination (string)
-#sout-standard-dst=
+# Value to adjust dts by (integer)
+#dirac-dts-offset=0
 
-# address to bind to (helper setting for dst) (string)
-#sout-standard-bind=
+[ts] # MPEG Transport Stream demuxer
 
-# filename for stream (helper setting for dst) (string)
-#sout-standard-path=
+# Extra PMT (string)
+#ts-extra-pmt=
 
-# SAP announcing (boolean)
-#sout-standard-sap=0
+# Set id of ES to PID (boolean)
+#ts-es-id-pid=1
 
-# Session name (string)
-#sout-standard-name=
+# Fast udp streaming (string)
+#ts-out=
 
-# Session groupname (string)
-#sout-standard-group=
+# MTU for out mode (integer)
+#ts-out-mtu=1400
 
-# Session description (string)
-#sout-standard-description=
+# CSA Key (string)
+#ts-csa-ck=
 
-# Session URL (string)
-#sout-standard-url=
+# Second CSA Key (string)
+#ts-csa2-ck=
 
-# Session email (string)
-#sout-standard-email=
+# Packet size in bytes to decrypt (integer)
+#ts-csa-pkt=188
 
-# Session phone number (string)
-#sout-standard-phone=
+# Silent mode (boolean)
+#ts-silent=0
 
-[stream_out_setid] # Change the id of an elementary stream
+# Filename of dump (string)
+#ts-dump-file=
 
-# Elementary Stream ID (integer)
-#sout-setid-id=0
+# Append (boolean)
+#ts-dump-append=0
 
-# New ES ID (integer)
-#sout-setid-new-id=0
+# Dump buffer size (integer)
+#ts-dump-size=16384
 
-# Elementary Stream ID (integer)
-#sout-setlang-id=0
+# Separate sub-streams (boolean)
+#ts-split-es=1
 
-# Language (string)
-#sout-setlang-lang=eng
+# Seek based on percent not time (boolean)
+#ts-seek-percent=0
 
-[stream_out_delay] # Delay a stream
+[live555] # RTP/RTSP/SDP demuxer (using Live555)
 
-# Elementary Stream ID (integer)
-#sout-delay-id=0
+# Use RTP over RTSP (TCP) (boolean)
+#rtsp-tcp=0
 
-# Delay of the ES (ms) (integer)
-#sout-delay-delay=0
+# Client port (integer)
+#rtp-client-port=-1
 
-[stream_out_mosaic_bridge] # Mosaic bridge stream output
+# Force multicast RTP via RTSP (boolean)
+#rtsp-mcast=0
 
-# ID (string)
-#sout-mosaic-bridge-id=Id
+# Tunnel RTSP and RTP over HTTP (boolean)
+#rtsp-http=0
 
-# Video width (integer)
-#sout-mosaic-bridge-width=0
+# HTTP tunnel port (integer)
+#rtsp-http-port=80
 
-# Video height (integer)
-#sout-mosaic-bridge-height=0
+# Kasenna RTSP dialect (boolean)
+#rtsp-kasenna=0
 
-# Sample aspect ratio (string)
-#sout-mosaic-bridge-sar=1:1
+# WMServer RTSP dialect (boolean)
+#rtsp-wmserver=0
 
-# Image chroma (string)
-#sout-mosaic-bridge-chroma=
+# RTSP user name (string)
+#rtsp-user=
 
-# Video filter (string)
-#sout-mosaic-bridge-vfilter=
+# RTSP password (string)
+#rtsp-pwd=
 
-# Transparency (integer)
-#sout-mosaic-bridge-alpha=255
+[avi] # AVI demuxer
 
-# X offset (integer)
-#sout-mosaic-bridge-x=-1
+# Force interleaved method (boolean)
+#avi-interleaved=0
 
-# Y offset (integer)
-#sout-mosaic-bridge-y=-1
+# Force index creation (integer)
+#avi-index=0
 
-[stream_out_record] # Record stream output
+[playlist] # Playlist
 
-# Destination prefix (string)
-#sout-record-dst-prefix=
+# Skip ads (boolean)
+#playlist-skip-ads=1
 
-[stream_out_select] # Select individual es to enable or disable from stream
+# Show shoutcast adult content (boolean)
+#shoutcast-show-adult=0
 
-# Command UDP port (integer)
-#sout-select-port=5001
+[es] # MPEG-I/II/4 / A52 / DTS / MLP audio
 
-# Disable ES id (integer)
-#sout-select-disable=-1
+# Frames per Second (float)
+#es-fps=25.000000
 
-# Enable ES id (integer)
-#sout-select-enable=-1
+[ps] # MPEG-PS demuxer
 
-[stream_out_transcode] # Transcode stream output
+# Trust MPEG timestamps (boolean)
+#ps-trust-timestamps=1
 
-# Video encoder (string)
-#sout-transcode-venc=
+[subtitle] # Text subtitles parser
 
-# Destination video codec (string)
-#sout-transcode-vcodec=
+# Frames per second (float)
+#sub-fps=0.000000
 
-# Video bitrate (integer)
-#sout-transcode-vb=0
+# Subtitles delay (integer)
+#sub-delay=0
 
-# Video scaling (float)
-#sout-transcode-scale=0.000000
+# Subtitles format (string)
+#sub-type=auto
 
-# Video frame-rate (float)
-#sout-transcode-fps=0.000000
+# Subtitles description (string)
+#sub-description=
 
-# Hurry up (boolean)
-#sout-transcode-hurry-up=1
+[rawaud] # Raw audio demuxer
 
-# Deinterlace video (boolean)
-#sout-transcode-deinterlace=0
+# Audio channels (integer)
+#rawaud-channels=2
 
-# Deinterlace module (string)
-#sout-transcode-deinterlace-module=deinterlace
+# Audio samplerate (Hz) (integer)
+#rawaud-samplerate=48000
 
-# Video width (integer)
-#sout-transcode-width=0
+# FOURCC code of raw input format (string)
+#rawaud-fourcc=s16l
 
-# Video height (integer)
-#sout-transcode-height=0
+# Forces the audio language (string)
+#rawaud-lang=eng
 
-# Maximum video width (integer)
-#sout-transcode-maxwidth=0
+[mod] # MOD demuxer (libmodplug)
 
-# Maximum video height (integer)
-#sout-transcode-maxheight=0
+# Noise reduction (boolean)
+#mod-noisereduction=1
 
-# Video filter (string)
-#sout-transcode-vfilter=
+# Reverb (boolean)
+#mod-reverb=0
 
-# Audio encoder (string)
-#sout-transcode-aenc=
+# Reverberation level (integer)
+#mod-reverb-level=0
 
-# Destination audio codec (string)
-#sout-transcode-acodec=
+# Reverberation delay (integer)
+#mod-reverb-delay=40
 
-# Audio bitrate (integer)
-#sout-transcode-ab=96
+# Mega bass (boolean)
+#mod-megabass=0
 
-# Audio Language (string)
-#sout-transcode-alang=
+# Mega bass level (integer)
+#mod-megabass-level=0
 
-# Audio channels (integer)
-#sout-transcode-channels=0
+# Mega bass cutoff (integer)
+#mod-megabass-range=10
 
-# Audio sample rate (integer)
-#sout-transcode-samplerate=0
+# Surround (boolean)
+#mod-surround=0
 
-# Synchronise on audio track (boolean)
-#sout-transcode-audio-sync=0
+# Surround level (integer)
+#mod-surround-level=0
 
-# Audio filter (string)
-#sout-transcode-afilter=
+# Surround delay (ms) (integer)
+#mod-surround-delay=5
 
-# Subtitles encoder (string)
-#sout-transcode-senc=
+[mjpeg] # M-JPEG camera demuxer
 
-# Destination subtitles codec (string)
-#sout-transcode-scodec=
+# Frames per Second (float)
+#mjpeg-fps=0.000000
 
-# Destination subtitles codec (boolean)
-#sout-transcode-soverlay=0
+[image] # Image demuxer
 
-# Overlays (string)
-#sout-transcode-sfilter=
+# ES ID (integer)
+#image-id=-1
 
-# OSD menu (boolean)
-#sout-transcode-osd=0
+# Group (integer)
+#image-group=0
 
-# Number of threads (integer)
-#sout-transcode-threads=0
+# Decode (boolean)
+#image-decode=1
 
-# High priority (boolean)
-#sout-transcode-high-priority=0
+# Forced chroma (string)
+#image-chroma=
 
-[stream_out_raop] # Remote Audio Output Protocol stream output
+# Duration in seconds (float)
+#image-duration=10.000000
 
-# Host (string)
-#sout-raop-host=
+# Frame rate (string)
+#image-fps=10/1
 
-# Password (string)
-#sout-raop-password=
+# Real-time (boolean)
+#image-realtime=0
 
-# Password file (string)
-#sout-raop-password-file=
+[h264] # H264 video demuxer
 
-# Volume (integer)
-#sout-raop-volume=100
+# Frames per Second (float)
+#h264-fps=25.000000
 
-[stream_out_display] # Display stream output
+[rawvid] # Raw video demuxer
 
-# Enable audio (boolean)
-#sout-display-audio=1
+# Frames per Second (string)
+#rawvid-fps=
 
-# Enable video (boolean)
-#sout-display-video=1
+# Width (integer)
+#rawvid-width=0
 
-# Delay (ms) (integer)
-#sout-display-delay=100
+# Height (integer)
+#rawvid-height=0
 
-[stream_out_smem] # Stream output to memory buffer
+# Force chroma (Use carefully) (string)
+#rawvid-chroma=
 
-# Time Synchronized output (boolean)
-#sout-smem-time-sync=1
+# Aspect ratio (string)
+#rawvid-aspect-ratio=
 
-[stream_out_bridge] # Bridge stream output
+[rawdv] # DV (Digital Video) demuxer
 
-# ID (integer)
-#sout-bridge-out-id=0
+# Hurry up (boolean)
+#rawdv-hurry-up=0
 
-# Destination bridge-in name (string)
-#sout-bridge-out-in-name=default
+[mkv] # Matroska stream demuxer
 
-# Delay (integer)
-#sout-bridge-in-delay=0
+# Respect ordered chapters (boolean)
+#mkv-use-ordered-chapters=1
 
-# ID Offset (integer)
-#sout-bridge-in-id-offset=8192
+# Chapter codecs (boolean)
+#mkv-use-chapter-codec=1
 
-# Name of current instance (string)
-#sout-bridge-in-name=default
+# Preload MKV files in the same directory (boolean)
+#mkv-preload-local-dir=1
 
-# Fallback to placeholder stream when out of data (boolean)
-#sout-bridge-in-placeholder=0
+# Seek based on percent not time (boolean)
+#mkv-seek-percent=0
 
-# Placeholder delay (integer)
-#sout-bridge-in-placeholder-delay=200
+# Dummy Elements (boolean)
+#mkv-use-dummy=0
 
-# Wait for I frame before toggling placeholder (boolean)
-#sout-bridge-in-placeholder-switch-on-iframe=1
+[vc1] # VC1 video demuxer
 
-[stream_out_langfromtelx] # Dynamic language setting from teletext
+# Frames per Second (float)
+#vc1-fps=25.000000
 
-# Elementary Stream ID (integer)
-#sout-langfromtelx-id=0
+[avformat] # Avformat demuxer
 
-# Magazine (integer)
-#sout-langfromtelx-magazine=7
+# Format name (string)
+#ffmpeg-format=
 
-# Page (integer)
-#sout-langfromtelx-page=153
+# Avformat mux (string)
+#ffmpeg-mux=
 
-# Row (integer)
-#sout-langfromtelx-row=1
+[access_http] # HTTP input
 
-[stream_out_rtp] # RTP stream output
+# HTTP proxy (string)
+#http-proxy=
 
-# Destination (string)
-#sout-rtp-dst=
+# HTTP proxy password (string)
+#http-proxy-pwd=
 
-# SDP (string)
-#sout-rtp-sdp=
+# HTTP referer value (string)
+#http-referrer=
 
-# Muxer (string)
-#sout-rtp-mux=
+# User Agent (string)
+#http-user-agent=
 
-# SAP announcing (boolean)
-#sout-rtp-sap=0
+# Auto re-connect (boolean)
+#http-reconnect=0
 
-# Session name (string)
-#sout-rtp-name=
+# Continuous stream (boolean)
+#http-continuous=0
 
-# Session description (string)
-#sout-rtp-description=
+# Forward Cookies (boolean)
+#http-forward-cookies=1
 
-# Session URL (string)
-#sout-rtp-url=
+[access_udp] # UDP input
 
-# Session email (string)
-#sout-rtp-email=
+[dvdnav] # DVDnav Input
 
-# Session phone number (string)
-#sout-rtp-phone=
+# DVD angle (integer)
+#dvdnav-angle=1
 
-# Transport protocol (string)
-#sout-rtp-proto=udp
+# Start directly in menu (boolean)
+#dvdnav-menu=1
 
-# Port (integer)
-#sout-rtp-port=5004
+[linsys_sdi] # SDI Input
 
-# Audio port (integer)
-#sout-rtp-port-audio=0
+# Link # (integer)
+#linsys-sdi-link=0
 
-# Video port (integer)
-#sout-rtp-port-video=0
+# Video ID (integer)
+#linsys-sdi-id-video=0
 
-# Hop limit (TTL) (integer)
-#sout-rtp-ttl=-1
+# Aspect ratio (string)
+#linsys-sdi-aspect-ratio=
 
-# RTP/RTCP multiplexing (boolean)
-#sout-rtp-rtcp-mux=0
+# Audio configuration (string)
+#linsys-sdi-audio=0=1,1
 
-# Caching value (ms) (integer)
-#sout-rtp-caching=300
+# Teletext configuration (string)
+#linsys-sdi-telx=
+
+# Teletext language (string)
+#linsys-sdi-telx-lang=
+
+[rtp] # Real-Time Protocol (RTP) input
+
+# RTCP (local) port (integer)
+#rtcp-port=0
 
 # SRTP key (hexadecimal) (string)
-#sout-rtp-key=
+#srtp-key=
 
 # SRTP salt (hexadecimal) (string)
-#sout-rtp-salt=
+#srtp-salt=
 
-# MP4A LATM (boolean)
-#sout-rtp-mp4a-latm=0
+# Maximum RTP sources (integer)
+#rtp-max-src=1
 
-# RTSP session timeout (s) (integer)
-#rtsp-timeout=60
+# RTP source timeout (sec) (integer)
+#rtp-timeout=5
 
-# Username (string)
-#sout-rtsp-user=
+# Maximum RTP sequence number dropout (integer)
+#rtp-max-dropout=3000
 
-# Password (string)
-#sout-rtsp-pwd=
+# Maximum RTP sequence number misordering (integer)
+#rtp-max-misorder=100
 
-[xcb_xv] # XVideo output (XCB)
+# RTP payload format assumed for dynamic payloads (string)
+#rtp-dynamic-pt=
 
-# XVideo adaptor number (integer)
-#xvideo-adaptor=-1
+[xcb_screen] # Screen capture (with X11/XCB)
 
-# XVideo format id (integer)
-#xvideo-format-id=0
+# Frame rate (float)
+#screen-fps=2.000000
 
-[fb] # GNU/Linux framebuffer video output
+# Region left column (integer)
+#screen-left=0
 
-# Framebuffer device (string)
-#fbdev=/dev/fb0
+# Region top row (integer)
+#screen-top=0
 
-# Run fb on current tty (boolean)
-#fb-tty=1
+# Capture region width (integer)
+#screen-width=0
 
-# Image format (default RGB) (string)
-#fb-chroma=
+# Capture region height (integer)
+#screen-height=0
 
-# Framebuffer resolution to use (integer)
-#fb-mode=4
+# Follow the mouse (boolean)
+#screen-follow-mouse=0
 
-# Framebuffer uses hw acceleration (boolean)
-#fb-hw-accel=1
+[dtv] # Digital Television and Radio
 
-[xcb_window] # X11 video window (XCB)
+# DVB adapter (integer)
+#dvb-adapter=0
 
-# X11 display (string)
-#x11-display=
+# DVB device (integer)
+#dvb-device=0
 
-[vdummy] # Dummy video output
+# Do not demultiplex (boolean)
+#dvb-budget-mode=0
 
-# Dummy image chroma format (string)
-#dummy-chroma=
+# Frequency (Hz) (integer)
+#dvb-frequency=0
 
-[vout_sdl] # Simple DirectMedia Layer video output
+# Spectrum inversion (integer)
+#dvb-inversion=-1
 
-# SDL chroma format (string)
-#sdl-chroma=
+# Bandwidth (MHz) (integer)
+#dvb-bandwidth=0
 
-[xcb_x11] # X11 video output (XCB)
+# Transmission mode (integer)
+#dvb-transmission=0
 
-[yuv] # YUV video output
+# Guard interval (string)
+#dvb-guard=
 
-# device, fifo or filename (string)
-#yuv-file=stream.yuv
+# High-priority code rate (string)
+#dvb-code-rate-hp=
 
-# Chroma used (string)
-#yuv-chroma=
+# Low-priority code rate (string)
+#dvb-code-rate-lp=
 
-# YUV4MPEG2 header (default disabled) (boolean)
-#yuv-yuv4mpeg2=0
+# Hierarchy mode (integer)
+#dvb-hierarchy=-1
 
-[vmem] # Video memory output
+# Layer A modulation (string)
+#dvb-a-modulation=
 
-# Width (integer)
-#vmem-width=320
+# Layer A code rate (string)
+#dvb-a-fec=
 
-# Height (integer)
-#vmem-height=200
+# Layer A segments count (integer)
+#dvb-a-count=0
 
-# Pitch (integer)
-#vmem-pitch=640
+# Layer A time interleaving (integer)
+#dvb-a-interleaving=0
 
-# Chroma (string)
-#vmem-chroma=RV16
+# Layer B modulation (string)
+#dvb-b-modulation=
 
-[folder] # Folder meta data
+# Layer B code rate (string)
+#dvb-b-fec=
 
-# Album art filename (string)
-#album-art-filename=
+# Layer B segments count (integer)
+#dvb-b-count=0
 
-[packetizer_mpegvideo] # MPEG-I/II video packetizer
+# Layer B time interleaving (integer)
+#dvb-b-interleaving=0
 
-# Sync on Intra Frame (boolean)
-#packetizer-mpegvideo-sync-iframe=0
+# Layer C modulation (string)
+#dvb-c-modulation=
 
-[notify] # LibNotify Notification Plugin
+# Layer C code rate (string)
+#dvb-c-fec=
 
-# Timeout (ms) (integer)
-#notify-timeout=4000
+# Layer C segments count (integer)
+#dvb-c-count=0
 
-[telepathy] # Telepathy "Now Playing" (MissionControl)
+# Layer C time interleaving (integer)
+#dvb-c-interleaving=0
 
-[oldrc] # Remote control interface
+# Modulation / Constellation (string)
+#dvb-modulation=
 
-# Show stream position (boolean)
-#rc-show-pos=0
+# Symbol rate (bauds) (integer)
+#dvb-srate=0
 
-# Fake TTY (boolean)
-#rc-fake-tty=0
+# FEC code rate (string)
+#dvb-fec=
 
-# UNIX socket command input (string)
-#rc-unix=
+# Pilot (integer)
+#dvb-pilot=-1
 
-# TCP command input (string)
-#rc-host=
+# Roll-off factor (integer)
+#dvb-rolloff=-1
 
-[motion] # motion control interface
+# Transport stream ID (integer)
+#dvb-ts-id=0
 
-# Use the rotate video filter instead of transform (boolean)
-#motion-use-rotate=0
+# Polarization (Voltage) (string)
+#dvb-polarization=
 
-[netsync] # Network synchronization
+#  (integer)
+#dvb-voltage=13
 
-# Network master clock (boolean)
-#netsync-master=0
+# High LNB voltage (boolean)
+#dvb-high-voltage=0
 
-# Master server ip address (string)
-#netsync-master-ip=
+# Local oscillator low frequency (kHz) (integer)
+#dvb-lnb-low=0
 
-# UDP timeout (in ms) (integer)
-#netsync-timeout=500
+# Local oscillator high frequency (kHz) (integer)
+#dvb-lnb-high=0
 
-[gestures] # Mouse gestures control interface
+# Universal LNB switch frequency (kHz) (integer)
+#dvb-lnb-switch=11700000
 
-# Motion threshold (10-100) (integer)
-#gestures-threshold=30
+# DiSEqC LNB number (integer)
+#dvb-satno=0
 
-# Trigger button (string)
-#gestures-button=right
+# Continuous 22kHz tone (integer)
+#dvb-tone=-1
 
-[hotkeys] # Hotkeys management interface
+[access_jack] # JACK audio input
 
-# MouseWheel up-down axis Control (integer)
-#hotkeys-mousewheel-mode=0
+# Pace (boolean)
+#jack-input-use-vlc-pace=0
 
-[dbus] # D-Bus control interface
+# Auto Connection (boolean)
+#jack-input-auto-connect=0
 
-# Unique DBUS service id (org.mpris.vlc-<pid>) (boolean)
-#dbus-unique-service-id=0
+[linsys_hdsdi] # HD-SDI Input
 
-[transform] # Video transformation filter
+# Link # (integer)
+#linsys-hdsdi-link=0
 
-# Transform type (string)
-#transform-type=90
+# Video ID (integer)
+#linsys-hdsdi-id-video=0
 
-[hqdn3d] # High Quality 3D Denoiser filter
+# Aspect ratio (string)
+#linsys-hdsdi-aspect-ratio=
 
-# Spatial luma strength (0-254) (float)
-#hqdn3d-luma-spat=4.000000
+# Audio configuration (string)
+#linsys-hdsdi-audio=0=1,1
 
-# Spatial chroma strength (0-254) (float)
-#hqdn3d-chroma-spat=3.000000
+[v4l2] # Video4Linux2 input
 
-# Temporal luma strength (0-254) (float)
-#hqdn3d-luma-temp=6.000000
+# Device (string)
+#v4l2-dev=/dev/video0
 
-# Temporal chroma strength (0-254) (float)
-#hqdn3d-chroma-temp=4.500000
+# Standard (string)
+#v4l2-standard=
 
-[croppadd] # Video scaling filter
+# Video input chroma format (string)
+#v4l2-chroma=
 
-# Pixels to crop from top (integer)
-#croppadd-croptop=0
+# Input (integer)
+#v4l2-input=0
 
-# Pixels to crop from bottom (integer)
-#croppadd-cropbottom=0
+# Audio input (integer)
+#v4l2-audio-input=-1
 
-# Pixels to crop from left (integer)
-#croppadd-cropleft=0
+# Width (integer)
+#v4l2-width=-1
 
-# Pixels to crop from right (integer)
-#croppadd-cropright=0
+# Height (integer)
+#v4l2-height=-1
 
-# Pixels to padd to top (integer)
-#croppadd-paddtop=0
+# Picture aspect-ratio n:m (string)
+#v4l2-aspect-ratio=4:3
 
-# Pixels to padd to bottom (integer)
-#croppadd-paddbottom=0
+# Framerate (float)
+#v4l2-fps=0.000000
 
-# Pixels to padd to left (integer)
-#croppadd-paddleft=0
+# Use libv4l2 (boolean)
+#v4l2-use-libv4l2=0
 
-# Pixels to padd to right (integer)
-#croppadd-paddright=0
+# Tuner id (integer)
+#v4l2-tuner=0
 
-[alphamask] # Alpha mask video filter
+# Frequency (integer)
+#v4l2-tuner-frequency=-1
 
-# Transparency mask (string)
-#alphamask-mask=
+# Audio mode (integer)
+#v4l2-tuner-audio-mode=-1
 
-[motionblur] # Motion blur filter
+# Reset controls (boolean)
+#v4l2-controls-reset=0
 
-# Blur factor (1-127) (integer)
-#blur-factor=80
+# Brightness (integer)
+#v4l2-brightness=-1
 
-[osdmenu] # On Screen Display menu
+# Automatic brightness (integer)
+#v4l2-brightness-auto=-1
 
-# X coordinate (integer)
-#osdmenu-x=-1
+# Contrast (integer)
+#v4l2-contrast=-1
 
-# Y coordinate (integer)
-#osdmenu-y=-1
+# Saturation (integer)
+#v4l2-saturation=-1
 
-# Menu position (integer)
-#osdmenu-position=8
+# Hue (integer)
+#v4l2-hue=-1
 
-# Configuration file (string)
-#osdmenu-file=/usr/share/vlc/osdmenu/default.cfg
+# Automatic hue (integer)
+#v4l2-hue-auto=-1
 
-# Path to OSD menu images (string)
-#osdmenu-file-path=
+# White balance temperature (K) (integer)
+#v4l2-white-balance-temperature=-1
 
-# Menu timeout (integer)
-#osdmenu-timeout=15
+# Automatic white balance (integer)
+#v4l2-auto-white-balance=-1
 
-# Menu update interval (integer)
-#osdmenu-update=300
+# Red balance (integer)
+#v4l2-red-balance=-1
 
-# Alpha transparency value (default 255) (integer)
-#osdmenu-alpha=255
+# Blue balance (integer)
+#v4l2-blue-balance=-1
 
-[ball] # Ball video filter
+# Gamma (integer)
+#v4l2-gamma=-1
 
-# Ball color (string)
-#ball-color=red
+# Automatic gain (integer)
+#v4l2-autogain=-1
 
-# Ball speed (integer)
-#ball-speed=4
+# Gain (integer)
+#v4l2-gain=-1
 
-# Ball size (integer)
-#ball-size=10
+# Sharpness (integer)
+#v4l2-sharpness=-1
 
-# Gradient threshold (integer)
-#ball-gradient-threshold=40
+# Chroma gain (integer)
+#v4l2-chroma-gain=-1
 
-# Edge visible (boolean)
-#ball-edge-visible=1
+# Automatic chroma gain (integer)
+#v4l2-chroma-gain-auto=-1
 
-[sepia] # Sepia video filter
+# Power line frequency (integer)
+#v4l2-power-line-frequency=-1
 
-# Sepia intensity (integer)
-#sepia-intensity=120
+# Backlight compensation (integer)
+#v4l2-backlight-compensation=-1
 
-[adjust] # Image properties filter
+# Band-stop filter (integer)
+#v4l2-band-stop-filter=-1
 
-# Image contrast (0-2) (float)
-#contrast=1.000000
+# Horizontal flip (boolean)
+#v4l2-hflip=0
 
-# Image brightness (0-2) (float)
-#brightness=1.000000
+# Vertical flip (boolean)
+#v4l2-vflip=0
 
-# Image hue (0-360) (integer)
-#hue=0
+# Rotate (degrees) (integer)
+#v4l2-rotate=-1
 
-# Image saturation (0-3) (float)
-#saturation=1.000000
+# Color killer (integer)
+#v4l2-color-killer=-1
 
-# Image gamma (0-10) (float)
-#gamma=1.000000
+# Color effect (integer)
+#v4l2-color-effect=-1
 
-# Brightness threshold (boolean)
-#brightness-threshold=0
+# Audio volume (integer)
+#v4l2-audio-volume=-1
 
-[panoramix] # Panoramix: wall with overlap video filter
+# Audio balance (integer)
+#v4l2-audio-balance=-1
 
-# Number of columns (integer)
-#panoramix-cols=-1
+# Mute (boolean)
+#v4l2-audio-mute=0
 
-# Number of rows (integer)
-#panoramix-rows=-1
+# Bass level (integer)
+#v4l2-audio-bass=-1
 
-# length of the overlapping area (in %) (integer)
-#panoramix-bz-length=100
+# Treble level (integer)
+#v4l2-audio-treble=-1
 
-# height of the overlapping area (in %) (integer)
-#panoramix-bz-height=100
+# Loudness mode (boolean)
+#v4l2-audio-loudness=0
 
-# Attenuation (boolean)
-#panoramix-attenuate=1
+# v4l2 driver controls (string)
+#v4l2-set-ctrls=
 
-# Attenuation, begin (in %) (integer)
-#panoramix-bz-begin=0
+[access_alsa] # ALSA audio capture input
 
-# Attenuation, middle (in %) (integer)
-#panoramix-bz-middle=50
+# Stereo (boolean)
+#alsa-stereo=1
 
-# Attenuation, end (in %) (integer)
-#panoramix-bz-end=100
+# Capture format (default s16l) (string)
+#alsa-format=s16l
 
-# middle position (in %) (integer)
-#panoramix-bz-middle-pos=50
+# Samplerate (integer)
+#alsa-samplerate=48000
 
-# Gamma (Red) correction (float)
-#panoramix-bz-gamma-red=1.000000
+[access_oss] # OSS input
 
-# Gamma (Green) correction (float)
-#panoramix-bz-gamma-green=1.000000
+# Stereo (boolean)
+#oss-stereo=1
 
-# Gamma (Blue) correction (float)
-#panoramix-bz-gamma-blue=1.000000
+# Samplerate (integer)
+#oss-samplerate=48000
 
-# Black Crush for Red (integer)
-#panoramix-bz-blackcrush-red=140
+[dvdread] # DVDRead Input (no menu support)
 
-# Black Crush for Green (integer)
-#panoramix-bz-blackcrush-green=140
+# DVD angle (integer)
+#dvdread-angle=1
 
-# Black Crush for Blue (integer)
-#panoramix-bz-blackcrush-blue=140
+[access_shm] # Shared memory framebuffer
 
-# White Crush for Red (integer)
-#panoramix-bz-whitecrush-red=200
+# Frame rate (float)
+#shm-fps=10.000000
 
-# White Crush for Green (integer)
-#panoramix-bz-whitecrush-green=200
+# Frame buffer width (integer)
+#shm-width=800
 
-# White Crush for Blue (integer)
-#panoramix-bz-whitecrush-blue=200
+# Frame buffer height (integer)
+#shm-height=480
 
-# Black Level for Red (integer)
-#panoramix-bz-blacklevel-red=150
+# Frame buffer depth (integer)
+#shm-depth=32
 
-# Black Level for Green (integer)
-#panoramix-bz-blacklevel-green=150
+[access_imem] # Memory input
 
-# Black Level for Blue (integer)
-#panoramix-bz-blacklevel-blue=150
+# ID (integer)
+#imem-id=-1
 
-# White Level for Red (integer)
-#panoramix-bz-whitelevel-red=0
+# Group (integer)
+#imem-group=0
 
-# White Level for Green (integer)
-#panoramix-bz-whitelevel-green=0
+# Category (integer)
+#imem-cat=0
 
-# White Level for Blue (integer)
-#panoramix-bz-whitelevel-blue=0
+# Codec (string)
+#imem-codec=
 
-# Active windows (string)
-#panoramix-active=
+# Language (string)
+#imem-language=
 
-[puzzle] # Puzzle interactive game video filter
+# Sample rate (integer)
+#imem-samplerate=0
 
-# Number of puzzle rows (integer)
-#puzzle-rows=4
+# Channels count (integer)
+#imem-channels=0
 
-# Number of puzzle columns (integer)
-#puzzle-cols=4
+# Width (integer)
+#imem-width=0
 
-# Make one tile a black slot (boolean)
-#puzzle-black-slot=0
+# Height (integer)
+#imem-height=0
 
-[dynamicoverlay] # Dynamic video overlay
+# Display aspect ratio (string)
+#imem-dar=
 
-# Input FIFO (string)
-#overlay-input=
+# Frame rate (string)
+#imem-fps=
 
-# Output FIFO (string)
-#overlay-output=
+# Size (integer)
+#imem-size=0
 
-[swscale] # Video scaling filter
+[pvr] # IVTV MPEG Encoding cards input
 
-# Scaling mode (integer)
-#swscale-mode=2
+# Device (string)
+#pvr-device=/dev/video0
 
-[canvas] # Canvas video filter
+# Radio device (string)
+#pvr-radio-device=/dev/radio0
 
-# Output width (integer)
-#canvas-width=0
+# Norm (integer)
+#pvr-norm=0
 
-# Output height (integer)
-#canvas-height=0
+# Width (integer)
+#pvr-width=-1
 
-# Output picture aspect ratio (string)
-#canvas-aspect=
+# Height (integer)
+#pvr-height=-1
 
-# Pad video (boolean)
-#canvas-padd=1
+# Frequency (integer)
+#pvr-frequency=-1
 
-[clone] # Clone video filter
+# Framerate (integer)
+#pvr-framerate=-1
 
-# Number of clones (integer)
-#clone-count=2
+# Key interval (integer)
+#pvr-keyint=-1
 
-# Video output modules (string)
-#clone-vout-list=
+# Framerate (integer)
+#pvr-bframes=-1
 
-[postproc] # Video post processing filter
+# Bitrate (integer)
+#pvr-bitrate=-1
 
-# Post processing quality (integer)
-#postproc-q=6
+# Bitrate peak (integer)
+#pvr-bitrate-peak=-1
 
-# FFmpeg post processing filter chains (string)
-#postproc-name=default
+# Bitrate mode (integer)
+#pvr-bitrate-mode=-1
 
-[remoteosd] # Remote-OSD over VNC
+# Audio bitmask (integer)
+#pvr-audio-bitmask=-1
 
-# VNC Host (string)
-#rmtosd-host=myvdr
+# Volume (integer)
+#pvr-audio-volume=-1
 
-# VNC Port (integer)
-#rmtosd-port=20001
+# Channel (integer)
+#pvr-channel=-1
 
-# VNC Password (string)
-#rmtosd-password=
+[access_vdr] # VDR recordings
 
-# VNC poll interval (integer)
-#rmtosd-update=1000
+# Chapter offset in ms (integer)
+#vdr-chapter-offset=0
 
-# VNC polling (boolean)
-#rmtosd-vnc-polling=0
+# Frame rate (float)
+#vdr-fps=25.000000
 
-# Mouse events (boolean)
-#rmtosd-mouse-events=0
+[access_smb] # SMB input
 
-# Key events (boolean)
-#rmtosd-key-events=0
+# SMB user name (string)
+#smb-user=
 
-# Alpha transparency value (default 255) (integer)
-#rmtosd-alpha=255
+# SMB password (string)
+#smb-pwd=
 
-[colorthres] # Color threshold filter
+# SMB domain (string)
+#smb-domain=
 
-# Color (integer)
-#colorthres-color=16711680
+[access_ftp] # FTP input
 
-# Saturation threshold (integer)
-#colorthres-saturationthres=20
+# FTP user name (string)
+#ftp-user=anonymous
 
-# Similarity threshold (integer)
-#colorthres-similaritythres=15
+# FTP password (string)
+#ftp-pwd=anonymous@example.com
 
-[erase] # Erase video filter
+# FTP account (string)
+#ftp-account=anonymous
 
-# Image mask (string)
-#erase-mask=
+[filesystem] # File input
 
-# X coordinate (integer)
-#erase-x=0
+# Subdirectory behavior (string)
+#recursive=expand
 
-# Y coordinate (integer)
-#erase-y=0
+# Ignored extensions (string)
+#ignore-filetypes=m3u,db,nfo,ini,jpg,jpeg,ljpg,gif,png,pgm,pgmyuv,pbm,pam,tga,bmp,pnm,xpm,xcf,pcx,tif,tiff,lbm,sfv,txt,sub,idx,srt,cue,ssa
 
-[audiobargraph_v] # Audio Bar Graph Video sub source
+[access_mms] # Microsoft Media Server (MMS) input
 
-# Value of the audio channels levels (string)
-#audiobargraph_v-i_values=
+# TCP/UDP timeout (ms) (integer)
+#mms-timeout=5000
 
-# X coordinate (integer)
-#audiobargraph_v-x=0
+# Force selection of all streams (boolean)
+#mms-all=0
 
-# Y coordinate (integer)
-#audiobargraph_v-y=0
+# Maximum bitrate (integer)
+#mms-maxbitrate=0
 
-# Transparency of the bargraph (integer)
-#audiobargraph_v-transparency=255
+# HTTP proxy (string)
+#mmsh-proxy=
 
-# Bargraph position (integer)
-#audiobargraph_v-position=-1
+[cdda] # Audio CD input
 
-# Alarm (integer)
-#audiobargraph_v-alarm=0
+# CDDB Server (string)
+#cddb-server=freedb.videolan.org
 
-# Bar width in pixel (default : 10) (integer)
-#audiobargraph_v-barWidth=10
+# CDDB port (integer)
+#cddb-port=80
 
-[gaussianblur] # Gaussian blur video filter
+[scaletempo] # Audio tempo scaler synched with rate
 
-# Gaussian's std deviation (float)
-#gaussianblur-sigma=2.000000
+# Stride Length (integer)
+#scaletempo-stride=30
 
-[sharpen] # Sharpen video filter
+# Overlap Length (float)
+#scaletempo-overlap=0.200000
 
-# Sharpen strength (0-2) (float)
-#sharpen-sigma=0.050000
+# Search Length (integer)
+#scaletempo-search=14
 
-[posterize] # Posterize video filter
+[param_eq] # Parametric Equalizer
 
-# Posterize level (integer)
-#posterize-level=6
+# Low freq (Hz) (float)
+#param-eq-lowf=100.000000
 
-[wall] # Wall video filter
+# Low freq gain (dB) (float)
+#param-eq-lowgain=0.000000
 
-# Number of columns (integer)
-#wall-cols=3
+# High freq (Hz) (float)
+#param-eq-highf=10000.000000
 
-# Number of rows (integer)
-#wall-rows=3
+# High freq gain (dB) (float)
+#param-eq-highgain=0.000000
 
-# Active windows (string)
-#wall-active=
+# Freq 1 (Hz) (float)
+#param-eq-f1=300.000000
 
-# Element aspect ratio (string)
-#wall-element-aspect=16:9
+# Freq 1 gain (dB) (float)
+#param-eq-gain1=0.000000
 
-[mosaic] # Mosaic video sub source
+# Freq 1 Q (float)
+#param-eq-q1=3.000000
 
-# Transparency (integer)
-#mosaic-alpha=255
+# Freq 2 (Hz) (float)
+#param-eq-f2=1000.000000
 
-# Height (integer)
-#mosaic-height=100
+# Freq 2 gain (dB) (float)
+#param-eq-gain2=0.000000
 
-# Width (integer)
-#mosaic-width=100
+# Freq 2 Q (float)
+#param-eq-q2=3.000000
 
-# Mosaic alignment (integer)
-#mosaic-align=5
+# Freq 3 (Hz) (float)
+#param-eq-f3=3000.000000
 
-# Top left corner X coordinate (integer)
-#mosaic-xoffset=0
+# Freq 3 gain (dB) (float)
+#param-eq-gain3=0.000000
 
-# Top left corner Y coordinate (integer)
-#mosaic-yoffset=0
+# Freq 3 Q (float)
+#param-eq-q3=3.000000
 
-# Border width (integer)
-#mosaic-borderw=0
+[compressor] # Dynamic range compressor
 
-# Border height (integer)
-#mosaic-borderh=0
+# RMS/peak (float)
+#compressor-rms-peak=0.000000
 
-# Positioning method (integer)
-#mosaic-position=0
+# Attack time (float)
+compressor-attack=1.400000
 
-# Number of rows (integer)
-#mosaic-rows=2
+# Release time (float)
+compressor-release=1.900000
 
-# Number of columns (integer)
-#mosaic-cols=2
+# Threshold level (float)
+compressor-threshold=0.000000
 
-# Keep aspect ratio (boolean)
-#mosaic-keep-aspect-ratio=0
+# Ratio (float)
+compressor-ratio=1.000000
 
-# Keep original size (boolean)
-#mosaic-keep-picture=0
+# Knee radius (float)
+compressor-knee=1.000000
 
-# Elements order (string)
-#mosaic-order=
+# Makeup gain (float)
+compressor-makeup-gain=0.000000
 
-# Offsets in order (string)
-#mosaic-offsets=
+[samplerate] # Secret Rabbit Code (libsamplerate) resampler
 
-# Delay (integer)
-#mosaic-delay=0
+# Sample rate converter type (integer)
+#src-converter-type=2
 
-[antiflicker] # antiflicker video filter
+[mono] # Audio filter for stereo to mono conversion
 
-# Window size (integer)
-#antiflicker-window-size=10
+# Use downmix algorithm (boolean)
+#sout-mono-downmix=1
 
-# Softening value (integer)
-#antiflicker-softening-size=10
+# Select channel to keep (integer)
+#sout-mono-channel=-1
 
-[subsdelay] # Subtitles delay
+[speex_resampler] # Speex resampler
 
-# Delay calculation mode (integer)
-#subsdelay-mode=1
+# Resampling quality (integer)
+#speex-resampler-quality=4
 
-# Calculation factor (float)
-#subsdelay-factor=2.000000
+[audiobargraph_a] # Audio part of the BarGraph function
 
-# Maximum overlapping subtitles (integer)
-#subsdelay-overlap=3
+# TCP address to use (default localhost) (string)
+#audiobargraph_a-address=localhost
 
-# Minimum alpha value (integer)
-#subsdelay-min-alpha=70
+# TCP port to use (default 12345) (integer)
+#audiobargraph_a-port=12345
 
-# Interval between two disappearances (integer)
-#subsdelay-min-stops=1000
+# Defines if BarGraph information should be sent (default 1) (integer)
+#audiobargraph_a-bargraph=1
 
-# Interval between appearance and disappearance (integer)
-#subsdelay-min-start-stop=1000
+# Sends the barGraph information every n audio packets (default 4) (integer)
+#audiobargraph_a-bargraph_repetition=4
 
-# Interval between disappearance and appearance (integer)
-#subsdelay-min-stop-start=1000
+# Defines if silence alarm information should be sent (default 1) (integer)
+#audiobargraph_a-silence=1
 
-[rss] # RSS and Atom feed display
+# Time window to use in ms (default 5000) (integer)
+#audiobargraph_a-time_window=5000
 
-# Feed URLs (string)
-#rss-urls=
+# Minimum Audio level to raise the alarm (default 0.1) (float)
+#audiobargraph_a-alarm_threshold=0.100000
 
-# X offset (integer)
-#rss-x=0
+# Time between two alarm messages in ms (default 2000) (integer)
+#audiobargraph_a-repetition_time=2000
 
-# Y offset (integer)
-#rss-y=0
+# Force connection reset regularly (default 1) (integer)
+#audiobargraph_a-connection_reset=1
 
-# Text position (integer)
-#rss-position=-1
+[dtstofloat32] # DTS Coherent Acoustics audio decoder
 
-# Opacity (integer)
-#rss-opacity=255
+# DTS dynamic range compression (boolean)
+#dts-dynrng=1
 
-# Color (integer)
-#rss-color=16777215
+[a52tofloat32] # ATSC A/52 (AC-3) audio decoder
 
-# Font size, pixels (integer)
-#rss-size=-1
+# A/52 dynamic range compression (boolean)
+#a52-dynrng=1
 
-# Speed of feeds (integer)
-#rss-speed=100000
+# Enable internal upmixing (boolean)
+#a52-upmix=0
 
-# Max length (integer)
-#rss-length=60
+[spatializer] # Audio Spatializer
 
-# Refresh time (integer)
-#rss-ttl=1800
+# Room size (float)
+#spatializer-roomsize=1.050000
 
-# Feed images (boolean)
-#rss-images=1
+# Room width (float)
+#spatializer-width=10.000000
 
-# Title display mode (integer)
-#rss-title=-1
+# Wet (float)
+#spatializer-wet=3.000000
 
-[deinterlace] # Deinterlacing video filter
+# Dry (float)
+#spatializer-dry=2.000000
 
-# Streaming deinterlace mode (string)
-#sout-deinterlace-mode=blend
+# Damp (float)
+#spatializer-damp=1.000000
 
-# Phosphor chroma mode for 4:2:0 input (integer)
-#sout-deinterlace-phosphor-chroma=2
+[normvol] # Volume normalizer
 
-# Phosphor old field dimmer strength (integer)
-#sout-deinterlace-phosphor-dimmer=2
+# Number of audio buffers (integer)
+#norm-buff-size=20
 
-[marq] # Marquee display
+# Maximal volume level (float)
+#norm-max-level=2.000000
 
-# Text (string)
-#marq-marquee=VLC
+[headphone_channel_mixer] # Headphone virtual spatialization effect
 
-# X offset (integer)
-#marq-x=0
+# Characteristic dimension (integer)
+#headphone-dim=10
 
-# Y offset (integer)
-#marq-y=0
+# Compensate delay (boolean)
+#headphone-compensate=0
 
-# Marquee position (integer)
-#marq-position=-1
+# No decoding of Dolby Surround (boolean)
+#headphone-dolby=0
 
-# Opacity (integer)
-#marq-opacity=255
+[equalizer] # Equalizer with 10 bands
 
-# Color (integer)
-#marq-color=16777215
+# Equalizer preset (string)
+#equalizer-preset=flat
 
-# Font size, pixels (integer)
-#marq-size=-1
+# Bands gain (string)
+#equalizer-bands=
 
-# Timeout (integer)
-#marq-timeout=0
+# Two pass (boolean)
+#equalizer-2pass=0
 
-# Refresh period in ms (integer)
-#marq-refresh=1000
+# Global gain (float)
+equalizer-preamp=0.000000
 
-[atmo] # AtmoLight Filter
+[chorus_flanger] # Sound Delay
 
-# Device type (integer)
-#atmo-device=1
+# Delay time (float)
+#delay-time=40.000000
 
-# Serial Port/Device (string)
-#atmo-serialdev=/dev/ttyUSB0
+# Sweep Depth (float)
+#sweep-depth=6.000000
 
-# Color when paused (boolean)
-#atmo-usepausecolor=0
+# Sweep Rate (float)
+#sweep-rate=6.000000
 
-# Pause-Red (integer)
-#atmo-pcolor-red=0
+# Feedback Gain (float)
+#feedback-gain=0.500000
 
-# Pause-Green (integer)
-#atmo-pcolor-green=0
+# Wet mix (float)
+#wet-mix=0.400000
 
-# Pause-Blue (integer)
-#atmo-pcolor-blue=192
+# Dry Mix (float)
+#dry-mix=0.400000
 
-# Pause-Fadesteps (integer)
-#atmo-fadesteps=50
+[skins2] # Skinnable Interface
 
-# End-Red (integer)
-#atmo-ecolor-red=192
+# Skin to use (string)
+skins2-last=/usr/share/vlc/skins2/default.vlt
 
-# End-Green (integer)
-#atmo-ecolor-green=192
+# Config of last used skin (string)
+skins2-config=[aboutwin aboutwinwin-main 0 0 330 171 0][eqwin eqwin-main 0 0 330 171 0][fullscreenController fsc_normal 30 30 500 500 1][main normal 0 0 500 350 1][plwin plwin-normal 0 0 500 350 0]
 
-# End-Blue (integer)
-#atmo-ecolor-blue=192
+# Enable transparency effects (boolean)
+#skins2-transparency=0
 
-# End-Fadesteps (integer)
-#atmo-efadesteps=50
+# Use a skinned playlist (boolean)
+#skinned-playlist=1
 
-# Count of AtmoLight channels (integer)
-#atmo-dmx-channels=5
+# Display video in a skinned window if any (boolean)
+#skinned-video=1
 
-# DMX address for each channel (string)
-#atmo-dmx-chbase=0,3,6,9,12
+[qt4] # Qt interface
 
-# Count of channels (integer)
-#atmo-momo-channels=3
+# Start in minimal view (without menus) (boolean)
+#qt-minimal-view=0
 
-# Count of fnordlicht's (integer)
-#atmo-fnordlicht-amount=2
+# Systray icon (boolean)
+#qt-system-tray=1
 
-# Number of zones on top (integer)
-#atmo-zones-top=1
+# Show notification popup on track change (boolean)
+#qt-notification=1
 
-# Number of zones on bottom (integer)
-#atmo-zones-bottom=1
+# Start VLC with only a systray icon (boolean)
+#qt-start-minimized=0
 
-# Zones on left / right side (integer)
-#atmo-zones-lr=1
+# Pause the video playback when minimized (boolean)
+#qt-pause-minimized=0
 
-# Calculate a average zone (boolean)
-#atmo-zone-summary=0
+# Windows opacity between 0.1 and 1 (float)
+#qt-opacity=1.000000
 
-# Edge Weightning (integer)
-#atmo-edgeweightning=3
+# Fullscreen controller opacity between 0.1 and 1 (float)
+#qt-fs-opacity=0.800000
 
-# Brightness (integer)
-#atmo-brightness=100
+# Resize interface to the native video size (boolean)
+#qt-video-autoresize=1
 
-# Darkness Limit (integer)
-#atmo-darknesslimit=3
+# Show playing item name in window title (boolean)
+#qt-name-in-title=1
 
-# Hue windowing (integer)
-#atmo-huewinsize=3
+# Show a controller in fullscreen mode (boolean)
+#qt-fs-controller=1
 
-# Sat windowing (integer)
-#atmo-satwinsize=3
+# Save the recently played items in the menu (boolean)
+#qt-recentplay=1
 
-# Output Color filter mode (integer)
-#atmo-filtermode=1
+# List of words separated by | to filter (string)
+#qt-recentplay-filter=
 
-# Filter length (ms) (integer)
-#atmo-meanlength=300
+# Automatically save the volume on exit (boolean)
+#qt-autosave-volume=1
 
-# Filter threshold (integer)
-#atmo-meanthreshold=40
+# Embed the file browser in open dialog (boolean)
+#qt-embedded-open=0
 
-# Filter Smoothness (in %) (integer)
-#atmo-percentnew=50
+# Show advanced preferences over simple ones (boolean)
+#qt-advanced-pref=0
 
-# Frame delay (ms) (integer)
-#atmo-framedelay=18
+# Show unimportant error and warnings dialogs (boolean)
+#qt-error-dialogs=1
 
-# Channel 0: summary (integer)
-#atmo-channel_0=4
+# Define the colors of the volume slider  (string)
+#qt-slider-colours=153;210;153;20;210;20;255;199;15;245;39;29
 
-# Channel 1: left (integer)
-#atmo-channel_1=3
+# Ask for network policy at start (boolean)
+qt-privacy-ask=0
 
-# Channel 2: right (integer)
-#atmo-channel_2=1
+# Define which screen fullscreen goes (integer)
+#qt-fullscreen-screennumber=-1
 
-# Channel 3: top (integer)
-#atmo-channel_3=0
+# Load extensions on startup (boolean)
+#qt-autoload-extensions=1
 
-# Channel 4: bottom (integer)
-#atmo-channel_4=2
+# Display background cone or art (boolean)
+#qt-bgcone=1
 
-# Channel / Zone Assignment (string)
-#atmo-channels=
+# Expanding background cone or art. (boolean)
+#qt-bgcone-expands=0
 
-# Use Software White adjust (boolean)
-#atmo-whiteadj=1
+# Allow automatic icon changes (boolean)
+#qt-icon-change=1
 
-# White Red (integer)
-#atmo-white-red=255
+[ncurses] # Ncurses interface
 
-# White Green (integer)
-#atmo-white-green=255
+# Filebrowser starting point (string)
+#browse-dir=
 
-# White Blue (integer)
-#atmo-white-blue=255
+[access_output_http] # HTTP stream output
 
-# Zone 0: Top gradient (string)
-#atmo-gradient_zone_0=
+# Username (string)
+#sout-http-user=
 
-# Zone 1: Right gradient (string)
-#atmo-gradient_zone_1=
+# Password (string)
+#sout-http-pwd=
 
-# Zone 2: Bottom gradient (string)
-#atmo-gradient_zone_2=
+# Mime (string)
+#sout-http-mime=
 
-# Zone 3: Left gradient (string)
-#atmo-gradient_zone_3=
+[access_output_livehttp] # HTTP Live streaming output
 
-# Zone 4: Summary gradient (string)
-#atmo-gradient_zone_4=
+# Segment length (integer)
+#sout-livehttp-seglen=10
 
-# Gradient bitmap searchpath (string)
-#atmo-gradient_path=
+# Number of segments (integer)
+#sout-livehttp-numsegs=0
 
-# Extracted Image Width (integer)
-#atmo-width=64
+# Split segments anywhere (boolean)
+#sout-livehttp-splitanywhere=0
 
-# Extracted Image Height (integer)
-#atmo-height=48
+# Delete segments (boolean)
+#sout-livehttp-delsegs=1
 
-# Mark analyzed pixels (boolean)
-#atmo-showdots=0
+# Use muxers rate control mechanism (boolean)
+#sout-livehttp-ratecontrol=0
 
-[rotate] # Rotate video filter
+# Index file (string)
+#sout-livehttp-index=
 
-# Angle in degrees (integer)
-#rotate-angle=30
+# Full URL to put in index file (string)
+#sout-livehttp-index-url=
 
-[extract] # Extract RGB component video filter
+[access_output_file] # File stream output
 
-# RGB component to extract (integer)
-#extract-component=16711680
+# Append to file (boolean)
+#sout-file-append=0
 
-[gradient] # Gradient video filter
+# Synchronous writing (boolean)
+#sout-file-sync=0
 
-# Distort mode (string)
-#gradient-mode=gradient
+[access_output_shout] # IceCAST output
 
-# Gradient image type (integer)
-#gradient-type=0
+# Stream name (string)
+#sout-shout-name=VLC media player - Live stream
 
-# Apply cartoon effect (boolean)
-#gradient-cartoon=1
+# Stream description (string)
+#sout-shout-description=Live stream from VLC media player
 
-[scene] # Scene video filter
+# Stream MP3 (boolean)
+#sout-shout-mp3=0
 
-# Image format (string)
-#scene-format=png
+# Genre description (string)
+#sout-shout-genre=Alternative
 
-# Image width (integer)
-#scene-width=-1
+# URL description (string)
+#sout-shout-url=http://www.videolan.org/vlc
 
-# Image height (integer)
-#scene-height=-1
+# Bitrate (string)
+#sout-shout-bitrate=
 
-# Filename prefix (string)
-#scene-prefix=scene
+# Samplerate (string)
+#sout-shout-samplerate=
 
-# Directory path prefix (string)
-#scene-path=
+# Number of channels (string)
+#sout-shout-channels=
 
-# Always write to the same file (boolean)
-#scene-replace=0
+# Ogg Vorbis Quality (string)
+#sout-shout-quality=
 
-# Recording ratio (integer)
-#scene-ratio=50
+# Stream public (boolean)
+#sout-shout-public=0
 
-[blendbench] # Blending benchmark filter
+[access_output_udp] # UDP stream output
 
-# Number of time to blend (integer)
-#blendbench-loops=1000
+# Caching value (ms) (integer)
+#sout-udp-caching=300
 
-# Alpha of the blended image (integer)
-#blendbench-alpha=128
+# Group packets (integer)
+#sout-udp-group=1
 
-# Image to be blended onto (string)
-#blendbench-base-image=
+[folder] # Folder meta data
 
-# Chroma for the base image (string)
-#blendbench-base-chroma=I420
+# Album art filename (string)
+#album-art-filename=
 
-# Image which will be blended (string)
-#blendbench-blend-image=
+[visual] # Visualizer filter
 
-# Chroma for the blend image (string)
-#blendbench-blend-chroma=YUVA
+# Effects list (string)
+#effect-list=spectrum
 
-[grain] # Grain video filter
+# Video width (integer)
+#effect-width=800
 
-# Variance (float)
-#grain-variance=2.000000
+# Video height (integer)
+#effect-height=500
 
-# Minimal period (integer)
-#grain-period-min=1
+# Show 80 bands instead of 20 (boolean)
+#visual-80-bands=1
 
-# Maximal period (integer)
-#grain-period-max=48
+# Draw peaks in the analyzer (boolean)
+#visual-peaks=1
 
-[logo] # Logo sub source
+# Enable original graphic spectrum (boolean)
+#spect-show-original=0
 
-# Logo filenames (string)
-#logo-file=
+# Draw the base of the bands (boolean)
+#spect-show-base=1
 
-# X coordinate (integer)
-#logo-x=-1
+# Base pixel radius (integer)
+#spect-radius=42
 
-# Y coordinate (integer)
-#logo-y=-1
+# Spectral sections (integer)
+#spect-sections=3
 
-# Logo individual image time in ms (integer)
-#logo-delay=1000
+# V-plane color (integer)
+#spect-color=80
 
-# Logo animation # of loops (integer)
-#logo-repeat=-1
+# Draw bands in the spectrometer (boolean)
+#spect-show-bands=1
 
-# Opacity of the logo (integer)
-#logo-opacity=255
+# Show 80 bands instead of 20 (boolean)
+#spect-80-bands=1
 
-# Logo position (integer)
-#logo-position=-1
+# Number of blank pixels between bands. (integer)
+#spect-separ=1
 
-[gradfun] # Gradfun video filter
+# Amplification (integer)
+#spect-amp=8
 
-# Radius (integer)
-#gradfun-radius=16
+# Draw peaks in the analyzer (boolean)
+#spect-show-peaks=1
 
-# Strength (float)
-#gradfun-strength=1.200000
+# Peak extra width (integer)
+#spect-peak-width=61
+
+# Peak height (integer)
+#spect-peak-height=1
+
+[dynamicoverlay] # Dynamic video overlay
+
+# Input FIFO (string)
+#overlay-input=
+
+# Output FIFO (string)
+#overlay-output=
 
 [mirror] # Mirror video filter
 
@@ -1500,6 +1570,58 @@
 # Direction (integer)
 #mirror-direction=0
 
+[sharpen] # Sharpen video filter
+
+# Sharpen strength (0-2) (float)
+#sharpen-sigma=0.050000
+
+[blendbench] # Blending benchmark filter
+
+# Number of time to blend (integer)
+#blendbench-loops=1000
+
+# Alpha of the blended image (integer)
+#blendbench-alpha=128
+
+# Image to be blended onto (string)
+#blendbench-base-image=
+
+# Chroma for the base image (string)
+#blendbench-base-chroma=I420
+
+# Image which will be blended (string)
+#blendbench-blend-image=
+
+# Chroma for the blend image (string)
+#blendbench-blend-chroma=YUVA
+
+[colorthres] # Color threshold filter
+
+# Color (integer)
+#colorthres-color=16711680
+
+# Saturation threshold (integer)
+#colorthres-saturationthres=20
+
+# Similarity threshold (integer)
+#colorthres-similaritythres=15
+
+[puzzle] # Puzzle interactive game video filter
+
+# Number of puzzle rows (integer)
+#puzzle-rows=4
+
+# Number of puzzle columns (integer)
+#puzzle-cols=4
+
+# Make one tile a black slot (boolean)
+#puzzle-black-slot=0
+
+[swscale] # Video scaling filter
+
+# Scaling mode (integer)
+#swscale-mode=2
+
 [bluescreen] # Bluescreen video filter
 
 # Bluescreen U value (integer)
@@ -1514,507 +1636,710 @@
 # Bluescreen V tolerance (integer)
 #bluescreen-vt=17
 
-[playlist] # Playlist
+[clone] # Clone video filter
 
-# Skip ads (boolean)
-#playlist-skip-ads=1
+# Number of clones (integer)
+#clone-count=2
 
-# Show shoutcast adult content (boolean)
-#shoutcast-show-adult=0
+# Video output modules (string)
+#clone-vout-list=
 
-[vc1] # VC1 video demuxer
+[canvas] # Canvas video filter
 
-# Frames per Second (float)
-#vc1-fps=25.000000
+# Output width (integer)
+#canvas-width=0
 
-[ps] # MPEG-PS demuxer
+# Output height (integer)
+#canvas-height=0
 
-# Trust MPEG timestamps (boolean)
-#ps-trust-timestamps=1
+# Output picture aspect ratio (string)
+#canvas-aspect=
 
-[live555] # RTP/RTSP/SDP demuxer (using Live555)
+# Pad video (boolean)
+#canvas-padd=1
 
-# Use RTP over RTSP (TCP) (boolean)
-#rtsp-tcp=0
+[marq] # Marquee display
 
-# Client port (integer)
-#rtp-client-port=-1
+# Text (string)
+#marq-marquee=VLC
 
-# Force multicast RTP via RTSP (boolean)
-#rtsp-mcast=0
+# X offset (integer)
+#marq-x=0
 
-# Tunnel RTSP and RTP over HTTP (boolean)
-#rtsp-http=0
+# Y offset (integer)
+#marq-y=0
 
-# HTTP tunnel port (integer)
-#rtsp-http-port=80
+# Marquee position (integer)
+#marq-position=-1
 
-# Kasenna RTSP dialect (boolean)
-#rtsp-kasenna=0
+# Opacity (integer)
+#marq-opacity=255
 
-# WMServer RTSP dialect (boolean)
-#rtsp-wmserver=0
+# Color (integer)
+#marq-color=16777215
 
-# RTSP user name (string)
-#rtsp-user=
+# Font size, pixels (integer)
+#marq-size=-1
 
-# RTSP password (string)
-#rtsp-pwd=
+# Timeout (integer)
+#marq-timeout=0
 
-[subtitle] # Text subtitles parser
+# Refresh period in ms (integer)
+#marq-refresh=1000
 
-# Frames per second (float)
-#sub-fps=0.000000
+[deinterlace] # Deinterlacing video filter
 
-# Subtitles delay (integer)
-#sub-delay=0
+# Streaming deinterlace mode (string)
+#sout-deinterlace-mode=blend
 
-# Subtitles format (string)
-#sub-type=auto
+# Phosphor chroma mode for 4:2:0 input (integer)
+#sout-deinterlace-phosphor-chroma=2
 
-# Subtitles description (string)
-#sub-description=
+# Phosphor old field dimmer strength (integer)
+#sout-deinterlace-phosphor-dimmer=2
 
-[mkv] # Matroska stream demuxer
+[rss] # RSS and Atom feed display
 
-# Respect ordered chapters (boolean)
-#mkv-use-ordered-chapters=1
+# Feed URLs (string)
+#rss-urls=
 
-# Chapter codecs (boolean)
-#mkv-use-chapter-codec=1
+# X offset (integer)
+#rss-x=0
 
-# Preload MKV files in the same directory (boolean)
-#mkv-preload-local-dir=1
+# Y offset (integer)
+#rss-y=0
 
-# Seek based on percent not time (boolean)
-#mkv-seek-percent=0
+# Text position (integer)
+#rss-position=-1
 
-# Dummy Elements (boolean)
-#mkv-use-dummy=0
+# Opacity (integer)
+#rss-opacity=255
 
-[mod] # MOD demuxer (libmodplug)
+# Color (integer)
+#rss-color=16777215
 
-# Noise reduction (boolean)
-#mod-noisereduction=1
+# Font size, pixels (integer)
+#rss-size=-1
 
-# Reverb (boolean)
-#mod-reverb=0
+# Speed of feeds (integer)
+#rss-speed=100000
 
-# Reverberation level (integer)
-#mod-reverb-level=0
+# Max length (integer)
+#rss-length=60
 
-# Reverberation delay (integer)
-#mod-reverb-delay=40
+# Refresh time (integer)
+#rss-ttl=1800
 
-# Mega bass (boolean)
-#mod-megabass=0
+# Feed images (boolean)
+#rss-images=1
 
-# Mega bass level (integer)
-#mod-megabass-level=0
+# Title display mode (integer)
+#rss-title=-1
 
-# Mega bass cutoff (integer)
-#mod-megabass-range=10
+[ball] # Ball video filter
 
-# Surround (boolean)
-#mod-surround=0
+# Ball color (string)
+#ball-color=red
 
-# Surround level (integer)
-#mod-surround-level=0
+# Ball speed (integer)
+#ball-speed=4
 
-# Surround delay (ms) (integer)
-#mod-surround-delay=5
+# Ball size (integer)
+#ball-size=10
 
-[rawaud] # Raw audio demuxer
+# Gradient threshold (integer)
+#ball-gradient-threshold=40
 
-# Audio channels (integer)
-#rawaud-channels=2
+# Edge visible (boolean)
+#ball-edge-visible=1
 
-# Audio samplerate (Hz) (integer)
-#rawaud-samplerate=48000
+[mosaic] # Mosaic video sub source
 
-# FOURCC code of raw input format (string)
-#rawaud-fourcc=s16l
+# Transparency (integer)
+#mosaic-alpha=255
 
-# Forces the audio language (string)
-#rawaud-lang=eng
+# Height (integer)
+#mosaic-height=100
 
-[h264] # H264 video demuxer
+# Width (integer)
+#mosaic-width=100
 
-# Frames per Second (float)
-#h264-fps=25.000000
+# Mosaic alignment (integer)
+#mosaic-align=5
 
-[mjpeg] # M-JPEG camera demuxer
+# Top left corner X coordinate (integer)
+#mosaic-xoffset=0
 
-# Frames per Second (float)
-#mjpeg-fps=0.000000
+# Top left corner Y coordinate (integer)
+#mosaic-yoffset=0
 
-[avi] # AVI demuxer
+# Border width (integer)
+#mosaic-borderw=0
 
-# Force interleaved method (boolean)
-#avi-interleaved=0
+# Border height (integer)
+#mosaic-borderh=0
 
-# Force index creation (integer)
-#avi-index=0
+# Positioning method (integer)
+#mosaic-position=0
 
-[es] # MPEG-I/II/4 / A52 / DTS / MLP audio
+# Number of rows (integer)
+#mosaic-rows=2
 
-# Frames per Second (float)
-#es-fps=25.000000
+# Number of columns (integer)
+#mosaic-cols=2
 
-[rawvid] # Raw video demuxer
+# Keep aspect ratio (boolean)
+#mosaic-keep-aspect-ratio=0
 
-# Frames per Second (string)
-#rawvid-fps=
+# Keep original size (boolean)
+#mosaic-keep-picture=0
 
-# Width (integer)
-#rawvid-width=0
+# Elements order (string)
+#mosaic-order=
 
-# Height (integer)
-#rawvid-height=0
+# Offsets in order (string)
+#mosaic-offsets=
 
-# Force chroma (Use carefully) (string)
-#rawvid-chroma=
+# Delay (integer)
+#mosaic-delay=0
 
-# Aspect ratio (string)
-#rawvid-aspect-ratio=
+[audiobargraph_v] # Audio Bar Graph Video sub source
 
-[image] # Image demuxer
+# Value of the audio channels levels (string)
+#audiobargraph_v-i_values=
 
-# ES ID (integer)
-#image-id=-1
+# X coordinate (integer)
+#audiobargraph_v-x=0
 
-# Group (integer)
-#image-group=0
+# Y coordinate (integer)
+#audiobargraph_v-y=0
 
-# Decode (boolean)
-#image-decode=1
+# Transparency of the bargraph (integer)
+#audiobargraph_v-transparency=255
 
-# Forced chroma (string)
-#image-chroma=
+# Bargraph position (integer)
+#audiobargraph_v-position=-1
 
-# Duration in seconds (float)
-#image-duration=10.000000
+# Alarm (integer)
+#audiobargraph_v-alarm=0
 
-# Frame rate (string)
-#image-fps=10/1
+# Bar width in pixel (default : 10) (integer)
+#audiobargraph_v-barWidth=10
 
-# Real-time (boolean)
-#image-realtime=0
+[hqdn3d] # High Quality 3D Denoiser filter
 
-[rawdv] # DV (Digital Video) demuxer
+# Spatial luma strength (0-254) (float)
+#hqdn3d-luma-spat=4.000000
 
-# Hurry up (boolean)
-#rawdv-hurry-up=0
+# Spatial chroma strength (0-254) (float)
+#hqdn3d-chroma-spat=3.000000
 
-[ts] # MPEG Transport Stream demuxer
+# Temporal luma strength (0-254) (float)
+#hqdn3d-luma-temp=6.000000
 
-# Extra PMT (string)
-#ts-extra-pmt=
+# Temporal chroma strength (0-254) (float)
+#hqdn3d-chroma-temp=4.500000
 
-# Set id of ES to PID (boolean)
-#ts-es-id-pid=1
+[antiflicker] # antiflicker video filter
 
-# Fast udp streaming (string)
-#ts-out=
+# Window size (integer)
+#antiflicker-window-size=10
 
-# MTU for out mode (integer)
-#ts-out-mtu=1400
+# Softening value (integer)
+#antiflicker-softening-size=10
 
-# CSA Key (string)
-#ts-csa-ck=
+[alphamask] # Alpha mask video filter
 
-# Second CSA Key (string)
-#ts-csa2-ck=
+# Transparency mask (string)
+#alphamask-mask=
 
-# Packet size in bytes to decrypt (integer)
-#ts-csa-pkt=188
+[grain] # Grain video filter
 
-# Silent mode (boolean)
-#ts-silent=0
+# Variance (float)
+#grain-variance=2.000000
 
-# Filename of dump (string)
-#ts-dump-file=
+# Minimal period (integer)
+#grain-period-min=1
 
-# Append (boolean)
-#ts-dump-append=0
+# Maximal period (integer)
+#grain-period-max=48
 
-# Dump buffer size (integer)
-#ts-dump-size=16384
+[croppadd] # Video scaling filter
 
-# Separate sub-streams (boolean)
-#ts-split-es=1
+# Pixels to crop from top (integer)
+#croppadd-croptop=0
 
-# Seek based on percent not time (boolean)
-#ts-seek-percent=0
+# Pixels to crop from bottom (integer)
+#croppadd-cropbottom=0
 
-[dirac] # Dirac video demuxer
+# Pixels to crop from left (integer)
+#croppadd-cropleft=0
 
-# Value to adjust dts by (integer)
-#dirac-dts-offset=0
+# Pixels to crop from right (integer)
+#croppadd-cropright=0
 
-[avformat] # Avformat demuxer
+# Pixels to padd to top (integer)
+#croppadd-paddtop=0
 
-# Avformat mux (string)
-#ffmpeg-mux=
+# Pixels to padd to bottom (integer)
+#croppadd-paddbottom=0
 
-[demuxdump] # File dumper
+# Pixels to padd to left (integer)
+#croppadd-paddleft=0
 
-# Dump filename (string)
-#demuxdump-file=stream-demux.dump
+# Pixels to padd to right (integer)
+#croppadd-paddright=0
 
-# Append to existing file (boolean)
-#demuxdump-append=0
+[sepia] # Sepia video filter
 
-[audiobargraph_a] # Audio part of the BarGraph function
+# Sepia intensity (integer)
+#sepia-intensity=120
 
-# TCP address to use (default localhost) (string)
-#audiobargraph_a-address=localhost
+[gradfun] # Gradfun video filter
 
-# TCP port to use (default 12345) (integer)
-#audiobargraph_a-port=12345
+# Radius (integer)
+#gradfun-radius=16
 
-# Defines if BarGraph information should be sent (default 1) (integer)
-#audiobargraph_a-bargraph=1
+# Strength (float)
+#gradfun-strength=1.200000
 
-# Sends the barGraph information every n audio packets (default 4) (integer)
-#audiobargraph_a-bargraph_repetition=4
+[transform] # Video transformation filter
 
-# Defines if silence alarm information should be sent (default 1) (integer)
-#audiobargraph_a-silence=1
+# Transform type (string)
+#transform-type=90
 
-# Time window to use in ms (default 5000) (integer)
-#audiobargraph_a-time_window=5000
+[postproc] # Video post processing filter
 
-# Minimum Audio level to raise the alarm (default 0.1) (float)
-#audiobargraph_a-alarm_threshold=0.100000
+# Post processing quality (integer)
+#postproc-q=6
 
-# Time between two alarm messages in ms (default 2000) (integer)
-#audiobargraph_a-repetition_time=2000
+# FFmpeg post processing filter chains (string)
+#postproc-name=default
 
-# Force connection reset regularly (default 1) (integer)
-#audiobargraph_a-connection_reset=1
+[motionblur] # Motion blur filter
 
-[chorus_flanger] # Sound Delay
+# Blur factor (1-127) (integer)
+#blur-factor=80
 
-# Delay time (float)
-#delay-time=40.000000
+[gaussianblur] # Gaussian blur video filter
 
-# Sweep Depth (float)
-#sweep-depth=6.000000
+# Gaussian's std deviation (float)
+#gaussianblur-sigma=2.000000
 
-# Sweep Rate (float)
-#sweep-rate=6.000000
+[extract] # Extract RGB component video filter
 
-# Feedback Gain (float)
-#feedback-gain=0.500000
+# RGB component to extract (integer)
+#extract-component=16711680
 
-# Wet mix (float)
-#wet-mix=0.400000
+[gradient] # Gradient video filter
 
-# Dry Mix (float)
-#dry-mix=0.400000
+# Distort mode (string)
+#gradient-mode=gradient
 
-[mono] # Audio filter for stereo to mono conversion
+# Gradient image type (integer)
+#gradient-type=0
 
-# Use downmix algorithm (boolean)
-#sout-mono-downmix=1
+# Apply cartoon effect (boolean)
+#gradient-cartoon=1
 
-# Select channel to keep (integer)
-#sout-mono-channel=-1
+[adjust] # Image properties filter
 
-[scaletempo] # Audio tempo scaler synched with rate
+# Image contrast (0-2) (float)
+#contrast=1.000000
 
-# Stride Length (integer)
-#scaletempo-stride=30
+# Image brightness (0-2) (float)
+#brightness=1.000000
 
-# Overlap Length (float)
-#scaletempo-overlap=0.200000
+# Image hue (0-360) (integer)
+#hue=0
 
-# Search Length (integer)
-#scaletempo-search=14
+# Image saturation (0-3) (float)
+#saturation=1.000000
 
-[normvol] # Volume normalizer
+# Image gamma (0-10) (float)
+#gamma=1.000000
 
-# Number of audio buffers (integer)
-#norm-buff-size=20
+# Brightness threshold (boolean)
+#brightness-threshold=0
 
-# Maximal volume level (float)
-#norm-max-level=2.000000
+[atmo] # AtmoLight Filter
 
-[param_eq] # Parametric Equalizer
+# Device type (integer)
+#atmo-device=1
 
-# Low freq (Hz) (float)
-#param-eq-lowf=100.000000
+# Serial Port/Device (string)
+#atmo-serialdev=/dev/ttyUSB0
 
-# Low freq gain (dB) (float)
-#param-eq-lowgain=0.000000
+# Color when paused (boolean)
+#atmo-usepausecolor=0
 
-# High freq (Hz) (float)
-#param-eq-highf=10000.000000
+# Pause-Red (integer)
+#atmo-pcolor-red=0
 
-# High freq gain (dB) (float)
-#param-eq-highgain=0.000000
+# Pause-Green (integer)
+#atmo-pcolor-green=0
 
-# Freq 1 (Hz) (float)
-#param-eq-f1=300.000000
+# Pause-Blue (integer)
+#atmo-pcolor-blue=192
 
-# Freq 1 gain (dB) (float)
-#param-eq-gain1=0.000000
+# Pause-Fadesteps (integer)
+#atmo-fadesteps=50
 
-# Freq 1 Q (float)
-#param-eq-q1=3.000000
+# End-Red (integer)
+#atmo-ecolor-red=192
 
-# Freq 2 (Hz) (float)
-#param-eq-f2=1000.000000
+# End-Green (integer)
+#atmo-ecolor-green=192
 
-# Freq 2 gain (dB) (float)
-#param-eq-gain2=0.000000
+# End-Blue (integer)
+#atmo-ecolor-blue=192
 
-# Freq 2 Q (float)
-#param-eq-q2=3.000000
+# End-Fadesteps (integer)
+#atmo-efadesteps=50
 
-# Freq 3 (Hz) (float)
-#param-eq-f3=3000.000000
+# Count of AtmoLight channels (integer)
+#atmo-dmx-channels=5
 
-# Freq 3 gain (dB) (float)
-#param-eq-gain3=0.000000
+# DMX address for each channel (string)
+#atmo-dmx-chbase=0,3,6,9,12
 
-# Freq 3 Q (float)
-#param-eq-q3=3.000000
+# Count of channels (integer)
+#atmo-momo-channels=3
 
-[headphone_channel_mixer] # Headphone virtual spatialization effect
+# Count of fnordlicht's (integer)
+#atmo-fnordlicht-amount=2
 
-# Characteristic dimension (integer)
-#headphone-dim=10
+# Number of zones on top (integer)
+#atmo-zones-top=1
 
-# Compensate delay (boolean)
-#headphone-compensate=0
+# Number of zones on bottom (integer)
+#atmo-zones-bottom=1
 
-# No decoding of Dolby Surround (boolean)
-#headphone-dolby=0
+# Zones on left / right side (integer)
+#atmo-zones-lr=1
 
-[speex_resampler] # Speex resampler
+# Calculate a average zone (boolean)
+#atmo-zone-summary=0
 
-# Resampling quality (integer)
-#speex-resampler-quality=4
+# Edge Weightning (integer)
+#atmo-edgeweightning=3
 
-[dtstofloat32] # DTS Coherent Acoustics audio decoder
+# Brightness (integer)
+#atmo-brightness=100
 
-# DTS dynamic range compression (boolean)
-#dts-dynrng=1
+# Darkness Limit (integer)
+#atmo-darknesslimit=3
 
-[spatializer] # Audio Spatializer
+# Hue windowing (integer)
+#atmo-huewinsize=3
 
-# Room size (float)
-#spatializer-roomsize=1.050000
+# Sat windowing (integer)
+#atmo-satwinsize=3
 
-# Room width (float)
-#spatializer-width=10.000000
+# Output Color filter mode (integer)
+#atmo-filtermode=1
 
-# Wet (float)
-#spatializer-wet=3.000000
+# Filter length (ms) (integer)
+#atmo-meanlength=300
 
-# Dry (float)
-#spatializer-dry=2.000000
+# Filter threshold (integer)
+#atmo-meanthreshold=40
 
-# Damp (float)
-#spatializer-damp=1.000000
+# Filter Smoothness (in %) (integer)
+#atmo-percentnew=50
 
-[a52tofloat32] # ATSC A/52 (AC-3) audio decoder
+# Frame delay (ms) (integer)
+#atmo-framedelay=18
 
-# A/52 dynamic range compression (boolean)
-#a52-dynrng=1
+# Channel 0: summary (integer)
+#atmo-channel_0=4
 
-# Enable internal upmixing (boolean)
-#a52-upmix=0
+# Channel 1: left (integer)
+#atmo-channel_1=3
 
-[compressor] # Dynamic range compressor
+# Channel 2: right (integer)
+#atmo-channel_2=1
 
-# RMS/peak (float)
-#compressor-rms-peak=0.000000
+# Channel 3: top (integer)
+#atmo-channel_3=0
 
-# Attack time (float)
-compressor-attack=1.400000
+# Channel 4: bottom (integer)
+#atmo-channel_4=2
 
-# Release time (float)
-compressor-release=1.900000
+# Channel / Zone Assignment (string)
+#atmo-channels=
 
-# Threshold level (float)
-compressor-threshold=0.000000
+# Use Software White adjust (boolean)
+#atmo-whiteadj=1
 
-# Ratio (float)
-compressor-ratio=1.000000
+# White Red (integer)
+#atmo-white-red=255
 
-# Knee radius (float)
-compressor-knee=1.000000
+# White Green (integer)
+#atmo-white-green=255
 
-# Makeup gain (float)
-compressor-makeup-gain=0.000000
+# White Blue (integer)
+#atmo-white-blue=255
 
-[samplerate] # Secret Rabbit Code (libsamplerate) resampler
+# Zone 0: Top gradient (string)
+#atmo-gradient_zone_0=
 
-# Sample rate converter type (integer)
-#src-converter-type=1
+# Zone 1: Right gradient (string)
+#atmo-gradient_zone_1=
 
-[equalizer] # Equalizer with 10 bands
+# Zone 2: Bottom gradient (string)
+#atmo-gradient_zone_2=
 
-# Equalizer preset (string)
-#equalizer-preset=flat
+# Zone 3: Left gradient (string)
+#atmo-gradient_zone_3=
 
-# Bands gain (string)
-#equalizer-bands=
+# Zone 4: Summary gradient (string)
+#atmo-gradient_zone_4=
 
-# Two pass (boolean)
-#equalizer-2pass=0
+# Gradient bitmap searchpath (string)
+#atmo-gradient_path=
 
-# Global gain (float)
-equalizer-preamp=0.000000
+# Extracted Image Width (integer)
+#atmo-width=64
 
-[theora] # Theora video decoder
+# Extracted Image Height (integer)
+#atmo-height=48
 
-# Encoding quality (integer)
-#sout-theora-quality=2
+# Mark analyzed pixels (boolean)
+#atmo-showdots=0
 
-[zvbi] # VBI and Teletext decoder
+[osdmenu] # On Screen Display menu
 
-# Teletext page (integer)
-#vbi-page=100
+# X coordinate (integer)
+#osdmenu-x=-1
 
-# Teletext transparency (boolean)
-#vbi-opaque=1
+# Y coordinate (integer)
+#osdmenu-y=-1
 
-# Teletext alignment (integer)
-#vbi-position=4
+# Menu position (integer)
+#osdmenu-position=8
 
-# Teletext text subtitles (boolean)
-#vbi-text=0
+# Configuration file (string)
+#osdmenu-file=/usr/share/vlc/osdmenu/default.cfg
 
-[spudec] # DVD subtitles decoder
+# Path to OSD menu images (string)
+#osdmenu-file-path=
 
-# Disable DVD subtitle transparency (boolean)
-#dvdsub-transparency=0
+# Menu timeout (integer)
+#osdmenu-timeout=15
 
-[dvbsub] # DVB subtitles decoder
+# Menu update interval (integer)
+#osdmenu-update=300
 
-# Subpicture position (integer)
-#dvbsub-position=8
+# Alpha transparency value (default 255) (integer)
+#osdmenu-alpha=255
 
-# Decoding X coordinate (integer)
-#dvbsub-x=-1
+[rotate] # Rotate video filter
 
-# Decoding Y coordinate (integer)
-#dvbsub-y=-1
+# Angle in degrees (integer)
+#rotate-angle=30
 
-# Encoding X coordinate (integer)
-#sout-dvbsub-x=-1
+[remoteosd] # Remote-OSD over VNC
 
-# Encoding Y coordinate (integer)
-#sout-dvbsub-y=-1
+# VNC Host (string)
+#rmtosd-host=myvdr
 
-[ddummy] # Dummy decoder
+# VNC Port (integer)
+#rmtosd-port=20001
 
-# Save raw codec data (boolean)
-#dummy-save-es=0
+# VNC Password (string)
+#rmtosd-password=
+
+# VNC poll interval (integer)
+#rmtosd-update=1000
+
+# VNC polling (boolean)
+#rmtosd-vnc-polling=0
+
+# Mouse events (boolean)
+#rmtosd-mouse-events=0
+
+# Key events (boolean)
+#rmtosd-key-events=0
+
+# Alpha transparency value (default 255) (integer)
+#rmtosd-alpha=255
+
+[wall] # Wall video filter
+
+# Number of columns (integer)
+#wall-cols=3
+
+# Number of rows (integer)
+#wall-rows=3
+
+# Active windows (string)
+#wall-active=
+
+# Element aspect ratio (string)
+#wall-element-aspect=16:9
+
+[posterize] # Posterize video filter
+
+# Posterize level (integer)
+#posterize-level=6
+
+[panoramix] # Panoramix: wall with overlap video filter
+
+# Number of columns (integer)
+#panoramix-cols=-1
+
+# Number of rows (integer)
+#panoramix-rows=-1
+
+# length of the overlapping area (in %) (integer)
+#panoramix-bz-length=100
+
+# height of the overlapping area (in %) (integer)
+#panoramix-bz-height=100
+
+# Attenuation (boolean)
+#panoramix-attenuate=1
+
+# Attenuation, begin (in %) (integer)
+#panoramix-bz-begin=0
+
+# Attenuation, middle (in %) (integer)
+#panoramix-bz-middle=50
+
+# Attenuation, end (in %) (integer)
+#panoramix-bz-end=100
+
+# middle position (in %) (integer)
+#panoramix-bz-middle-pos=50
+
+# Gamma (Red) correction (float)
+#panoramix-bz-gamma-red=1.000000
+
+# Gamma (Green) correction (float)
+#panoramix-bz-gamma-green=1.000000
+
+# Gamma (Blue) correction (float)
+#panoramix-bz-gamma-blue=1.000000
+
+# Black Crush for Red (integer)
+#panoramix-bz-blackcrush-red=140
+
+# Black Crush for Green (integer)
+#panoramix-bz-blackcrush-green=140
+
+# Black Crush for Blue (integer)
+#panoramix-bz-blackcrush-blue=140
+
+# White Crush for Red (integer)
+#panoramix-bz-whitecrush-red=200
+
+# White Crush for Green (integer)
+#panoramix-bz-whitecrush-green=200
+
+# White Crush for Blue (integer)
+#panoramix-bz-whitecrush-blue=200
+
+# Black Level for Red (integer)
+#panoramix-bz-blacklevel-red=150
+
+# Black Level for Green (integer)
+#panoramix-bz-blacklevel-green=150
+
+# Black Level for Blue (integer)
+#panoramix-bz-blacklevel-blue=150
+
+# White Level for Red (integer)
+#panoramix-bz-whitelevel-red=0
+
+# White Level for Green (integer)
+#panoramix-bz-whitelevel-green=0
+
+# White Level for Blue (integer)
+#panoramix-bz-whitelevel-blue=0
+
+# Active windows (string)
+#panoramix-active=
+
+[erase] # Erase video filter
+
+# Image mask (string)
+#erase-mask=
+
+# X coordinate (integer)
+#erase-x=0
+
+# Y coordinate (integer)
+#erase-y=0
+
+[logo] # Logo sub source
+
+# Logo filenames (string)
+#logo-file=
+
+# X coordinate (integer)
+#logo-x=-1
+
+# Y coordinate (integer)
+#logo-y=-1
+
+# Logo individual image time in ms (integer)
+#logo-delay=1000
+
+# Logo animation # of loops (integer)
+#logo-repeat=-1
+
+# Opacity of the logo (integer)
+#logo-opacity=255
+
+# Logo position (integer)
+#logo-position=-1
+
+[scene] # Scene video filter
+
+# Image format (string)
+#scene-format=png
+
+# Image width (integer)
+#scene-width=-1
+
+# Image height (integer)
+#scene-height=-1
+
+# Filename prefix (string)
+#scene-prefix=scene
+
+# Directory path prefix (string)
+#scene-path=
+
+# Always write to the same file (boolean)
+#scene-replace=0
+
+# Recording ratio (integer)
+#scene-ratio=50
+
+[subsdelay] # Subtitles delay
+
+# Delay calculation mode (integer)
+#subsdelay-mode=1
+
+# Calculation factor (float)
+#subsdelay-factor=2.000000
+
+# Maximum overlapping subtitles (integer)
+#subsdelay-overlap=3
+
+# Minimum alpha value (integer)
+#subsdelay-min-alpha=70
+
+# Interval between two disappearances (integer)
+#subsdelay-min-stops=1000
+
+# Interval between appearance and disappearance (integer)
+#subsdelay-min-start-stop=1000
+
+# Interval between disappearance and appearance (integer)
+#subsdelay-min-stop-start=1000
 
 [x264] # H.264/MPEG4 AVC encoder (x264)
 
@@ -2237,6 +2562,13 @@ equalizer-preamp=0.000000
 # Tune the settings for a particular type of source or situation. Overridden by user settings. (string)
 #sout-x264-tune=
 
+[svcdsub] # Philips OGT (SVCD subtitle) decoder
+
+[theora] # Theora video decoder
+
+# Encoding quality (integer)
+#sout-theora-quality=2
+
 [speex] # Speex audio decoder
 
 # Mode (integer)
@@ -2285,19 +2617,19 @@ equalizer-preamp=0.000000
 # Formatted Subtitles (boolean)
 #subsdec-formatted=1
 
-[vorbis] # Vorbis audio decoder
+[zvbi] # VBI and Teletext decoder
 
-# Encoding quality (integer)
-#sout-vorbis-quality=0
+# Teletext page (integer)
+#vbi-page=100
 
-# Maximum encoding bitrate (integer)
-#sout-vorbis-max-bitrate=0
+# Teletext transparency (boolean)
+#vbi-opaque=1
 
-# Minimum encoding bitrate (integer)
-#sout-vorbis-min-bitrate=0
+# Teletext alignment (integer)
+#vbi-position=4
 
-# CBR encoding (boolean)
-#sout-vorbis-cbr=0
+# Teletext text subtitles (boolean)
+#vbi-text=0
 
 [schroedinger] # Dirac video decoder using libschroedinger
 
@@ -2397,10 +2729,37 @@ equalizer-preamp=0.000000
 # Force Profile (string)
 #sout-schro-force-profile=
 
-[fluidsynth] # FluidSynth MIDI synthesizer
+[kate] # Kate overlay decoder
 
-# Sound fonts (string)
-#soundfont=
+# Formatted Subtitles (boolean)
+#kate-formatted=1
+
+# Use Tiger for rendering (boolean)
+#kate-use-tiger=1
+
+# Rendering quality (float)
+#kate-tiger-quality=1.000000
+
+# Default font description (string)
+#kate-tiger-default-font-desc=
+
+# Default font effect (integer)
+#kate-tiger-default-font-effect=0
+
+# Default font effect strength (float)
+#kate-tiger-default-font-effect-strength=0.500000
+
+# Default font color (integer)
+#kate-tiger-default-font-color=16777215
+
+# Default font alpha (integer)
+#kate-tiger-default-font-alpha=255
+
+# Default background color (integer)
+#kate-tiger-default-background-color=16777215
+
+# Default background alpha (integer)
+#kate-tiger-default-background-alpha=0
 
 [avcodec] # FFmpeg audio/video decoder
 
@@ -2524,94 +2883,54 @@ equalizer-preamp=0.000000
 # Specify AAC audio profile to use (string)
 #sout-ffmpeg-aac-profile=low
 
-[svcdsub] # Philips OGT (SVCD subtitle) decoder
-
-[kate] # Kate overlay decoder
-
-# Formatted Subtitles (boolean)
-#kate-formatted=1
-
-# Use Tiger for rendering (boolean)
-#kate-use-tiger=1
-
-# Rendering quality (float)
-#kate-tiger-quality=1.000000
-
-# Default font description (string)
-#kate-tiger-default-font-desc=
-
-# Default font effect (integer)
-#kate-tiger-default-font-effect=0
-
-# Default font effect strength (float)
-#kate-tiger-default-font-effect-strength=0.500000
-
-# Default font color (integer)
-#kate-tiger-default-font-color=16777215
-
-# Default font alpha (integer)
-#kate-tiger-default-font-alpha=255
-
-# Default background color (integer)
-#kate-tiger-default-background-color=16777215
-
-# Default background alpha (integer)
-#kate-tiger-default-background-alpha=0
-
-[svg] # svg
-
-# SVG template file (string)
-#svg-template-file=
+[dvbsub] # DVB subtitles decoder
 
-[freetype] # Freetype2 font renderer
+# Subpicture position (integer)
+#dvbsub-position=8
 
-# Font (string)
-#freetype-font=Serif Bold
+# Decoding X coordinate (integer)
+#dvbsub-x=-1
 
-# Font size in pixels (integer)
-#freetype-fontsize=0
+# Decoding Y coordinate (integer)
+#dvbsub-y=-1
 
-# Relative font size (integer)
-#freetype-rel-fontsize=16
+# Encoding X coordinate (integer)
+#sout-dvbsub-x=-1
 
-# Text opacity (integer)
-#freetype-opacity=255
+# Encoding Y coordinate (integer)
+#sout-dvbsub-y=-1
 
-# Text default color (integer)
-#freetype-color=16777215
+[vorbis] # Vorbis audio decoder
 
-# Force bold (boolean)
-#freetype-bold=0
+# Encoding quality (integer)
+#sout-vorbis-quality=0
 
-# Background opacity (integer)
-#freetype-background-opacity=0
+# Maximum encoding bitrate (integer)
+#sout-vorbis-max-bitrate=0
 
-# Background color (integer)
-#freetype-background-color=0
+# Minimum encoding bitrate (integer)
+#sout-vorbis-min-bitrate=0
 
-# Outline opacity (integer)
-#freetype-outline-opacity=255
+# CBR encoding (boolean)
+#sout-vorbis-cbr=0
 
-# Outline color (integer)
-#freetype-outline-color=0
+[ddummy] # Dummy decoder
 
-# Outline thickness (integer)
-#freetype-outline-thickness=4
+# Save raw codec data (boolean)
+#dummy-save-es=0
 
-# Shadow opacity (integer)
-#freetype-shadow-opacity=128
+[fluidsynth] # FluidSynth MIDI synthesizer
 
-# Shadow color (integer)
-#freetype-shadow-color=0
+# Sound fonts (string)
+#soundfont=
 
-# Shadow angle (float)
-#freetype-shadow-angle=-45.000000
+# Synthesis gain (float)
+#synth-gain=0.800000
 
-# Shadow distance (float)
-#freetype-shadow-distance=0.060000
+[spudec] # DVD subtitles decoder
 
-# Use YUVP renderer (boolean)
-#freetype-yuvp=0
+# Disable DVD subtitle transparency (boolean)
+#dvdsub-transparency=0
 
 [sap] # Network streams (SAP)
 
@@ -2632,772 +2951,466 @@ equalizer-preamp=0.000000
 # Podcast URLs list (string)
 #podcast-urls=
 
-[skins2] # Skinnable Interface
-
-# Skin to use (string)
-skins2-last=/usr/share/vlc/skins2/default.vlt
-
-# Config of last used skin (string)
-skins2-config=[aboutwin aboutwinwin-main 0 0 330 171 0][eqwin eqwin-main 0 0 330 171 0][fullscreenController fsc_normal 30 30 500 500 1][main normal 0 0 500 350 1][plwin plwin-normal 0 0 500 350 0]
-
-# Enable transparency effects (boolean)
-#skins2-transparency=0
-
-# Use a skinned playlist (boolean)
-#skinned-playlist=1
-
-# Display video in a skinned window if any (boolean)
-#skinned-video=1
-
-[qt4] # Qt interface
-
-# Start in minimal view (without menus) (boolean)
-#qt-minimal-view=0
-
-# Systray icon (boolean)
-#qt-system-tray=1
-
-# Show notification popup on track change (boolean)
-#qt-notification=1
-
-# Start VLC with only a systray icon (boolean)
-#qt-start-minimized=0
-
-# Pause the video playback when minimized (boolean)
-#qt-pause-minimized=0
-
-# Windows opacity between 0.1 and 1 (float)
-#qt-opacity=1.000000
-
-# Fullscreen controller opacity between 0.1 and 1 (float)
-#qt-fs-opacity=0.800000
-
-# Resize interface to the native video size (boolean)
-#qt-video-autoresize=1
-
-# Show playing item name in window title (boolean)
-#qt-name-in-title=1
-
-# Show a controller in fullscreen mode (boolean)
-#qt-fs-controller=1
-
-# Save the recently played items in the menu (boolean)
-#qt-recentplay=1
-
-# List of words separated by | to filter (string)
-#qt-recentplay-filter=
-
-# Automatically save the volume on exit (boolean)
-#qt-autosave-volume=1
-
-# Embed the file browser in open dialog (boolean)
-#qt-embedded-open=0
-
-# Show advanced preferences over simple ones (boolean)
-#qt-advanced-pref=0
-
-# Show unimportant error and warnings dialogs (boolean)
-#qt-error-dialogs=1
-
-# Define the colors of the volume slider  (string)
-#qt-slider-colours=153;210;153;20;210;20;255;199;15;245;39;29
-
-# Ask for network policy at start (boolean)
-qt-privacy-ask=0
-
-# Define which screen fullscreen goes (integer)
-#qt-fullscreen-screennumber=-1
-
-# Load extensions on startup (boolean)
-#qt-autoload-extensions=1
-
-# Display background cone or art (boolean)
-#qt-bgcone=1
-
-# Expanding background cone or art. (boolean)
-#qt-bgcone-expands=0
-
-# Allow automatic icon changes (boolean)
-#qt-icon-change=1
-
-[ncurses] # Ncurses interface
+[lua] # Lua interpreter
 
-# Filebrowser starting point (string)
-#browse-dir=
+# Lua interface (string)
+#lua-intf=dummy
 
-[visual] # Visualizer filter
+# Lua interface configuration (string)
+#lua-config=
 
-# Effects list (string)
-#effect-list=spectrum
+# Source directory (string)
+#http-src=
 
-# Video width (integer)
-#effect-width=800
+# Directory index (boolean)
+#http-index=0
 
-# Video height (integer)
-#effect-height=500
+# TCP command input (string)
+#rc-host=
 
-# Show 80 bands instead of 20 (boolean)
-#visual-80-bands=1
+# CLI input (string)
+#cli-host=
 
-# Draw peaks in the analyzer (boolean)
-#visual-peaks=1
+# Host (string)
+#telnet-host=localhost
 
-# Enable original graphic spectrum (boolean)
-#spect-show-original=0
+# Port (integer)
+#telnet-port=4212
 
-# Draw the base of the bands (boolean)
-#spect-show-base=1
+# Password (string)
+#telnet-password=admin
 
-# Base pixel radius (integer)
-#spect-radius=42
+[stream_out_rtp] # RTP stream output
 
-# Spectral sections (integer)
-#spect-sections=3
+# Destination (string)
+#sout-rtp-dst=
 
-# V-plane color (integer)
-#spect-color=80
+# SDP (string)
+#sout-rtp-sdp=
 
-# Draw bands in the spectrometer (boolean)
-#spect-show-bands=1
+# Muxer (string)
+#sout-rtp-mux=
 
-# Show 80 bands instead of 20 (boolean)
-#spect-80-bands=1
+# SAP announcing (boolean)
+#sout-rtp-sap=0
 
-# Number of blank pixels between bands. (integer)
-#spect-separ=1
+# Session name (string)
+#sout-rtp-name=
 
-# Amplification (integer)
-#spect-amp=8
+# Session category (string)
+#sout-rtp-cat=
 
-# Draw peaks in the analyzer (boolean)
-#spect-show-peaks=1
+# Session description (string)
+#sout-rtp-description=
 
-# Peak extra width (integer)
-#spect-peak-width=61
+# Session URL (string)
+#sout-rtp-url=
 
-# Peak height (integer)
-#spect-peak-height=1
+# Session email (string)
+#sout-rtp-email=
 
-[gnutls] # GNU TLS transport layer security
+# Session phone number (string)
+#sout-rtp-phone=
 
-# TLS cipher priorities (string)
-#gnutls-priorities=NORMAL
+# Transport protocol (string)
+#sout-rtp-proto=udp
 
-[vod_rtsp] # RTSP VoD server
+# Port (integer)
+#sout-rtp-port=5004
 
-# MUX for RAW RTSP transport (string)
-#rtsp-raw-mux=ts
+# Audio port (integer)
+#sout-rtp-port-audio=0
 
-# Maximum number of connections (integer)
-#rtsp-throttle-users=0
+# Video port (integer)
+#sout-rtp-port-video=0
 
-# Sets the timeout option in the RTSP session string (integer)
-#rtsp-session-timeout=5
+# Hop limit (TTL) (integer)
+#sout-rtp-ttl=-1
 
-[logger] # File logging
+# RTP/RTCP multiplexing (boolean)
+#sout-rtp-rtcp-mux=0
 
-# Log filename (string)
-#logfile=
+# Caching value (ms) (integer)
+#sout-rtp-caching=300
 
-# Log format (string)
-#logmode=text
+# SRTP key (hexadecimal) (string)
+#sout-rtp-key=
 
-# Syslog facility (string)
-#syslog-facility=user
+# SRTP salt (hexadecimal) (string)
+#sout-rtp-salt=
 
-# Verbosity (integer)
-#log-verbose=-1
+# MP4A LATM (boolean)
+#sout-rtp-mp4a-latm=0
 
-[audioscrobbler] # Submission of played songs to last.fm
+# RTSP session timeout (s) (integer)
+#rtsp-timeout=60
 
 # Username (string)
-#lastfm-username=
+#sout-rtsp-user=
 
 # Password (string)
-#lastfm-password=
-
-# Scrobbler URL (string)
-#scrobbler-url=post.audioscrobbler.com
-
-[cdda] # Audio CD input
-
-# CDDB Server (string)
-#cddb-server=freedb.videolan.org
-
-# CDDB port (integer)
-#cddb-port=8880
-
-[dtv] # Digital Television and Radio
-
-# DVB adapter (integer)
-#dvb-adapter=0
-
-# Do not demultiplex (boolean)
-#dvb-budget-mode=0
-
-# Frequency (Hz) (integer)
-#dvb-frequency=0
-
-# Spectrum inversion (integer)
-#dvb-inversion=-1
-
-# Bandwidth (MHz) (integer)
-#dvb-bandwidth=0
-
-# Transmission mode (integer)
-#dvb-transmission=0
-
-# Guard interval (string)
-#dvb-guard=
-
-# High-priority code rate (string)
-#dvb-code-rate-hp=
-
-# Low-priority code rate (string)
-#dvb-code-rate-lp=
-
-# Hierarchy mode (integer)
-#dvb-hierarchy=-1
-
-# Layer A modulation (string)
-#dvb-a-modulation=
-
-# Layer A code rate (string)
-#dvb-a-fec=
-
-# Layer A segments count (integer)
-#dvb-a-count=0
-
-# Layer A time interleaving (integer)
-#dvb-a-interleaving=0
-
-# Layer B modulation (string)
-#dvb-b-modulation=
-
-# Layer B code rate (string)
-#dvb-b-fec=
-
-# Layer B segments count (integer)
-#dvb-b-count=0
-
-# Layer B time interleaving (integer)
-#dvb-b-interleaving=0
-
-# Layer C modulation (string)
-#dvb-c-modulation=
-
-# Layer C code rate (string)
-#dvb-c-fec=
-
-# Layer C segments count (integer)
-#dvb-c-count=0
-
-# Layer C time interleaving (integer)
-#dvb-c-interleaving=0
-
-# Modulation / Constellation (string)
-#dvb-modulation=
-
-# Symbol rate (bauds) (integer)
-#dvb-srate=0
-
-# FEC code rate (string)
-#dvb-fec=
-
-# Pilot (integer)
-#dvb-pilot=-1
-
-# Roll-off factor (integer)
-#dvb-rolloff=-1
-
-# Transport stream ID (integer)
-#dvb-ts-id=0
-
-# Polarization (Voltage) (string)
-#dvb-polarization=
-
-#  (integer)
-#dvb-voltage=13
-
-# High LNB voltage (boolean)
-#dvb-high-voltage=0
-
-# Local oscillator low frequency (kHz) (integer)
-#dvb-lnb-low=0
-
-# Local oscillator high frequency (kHz) (integer)
-#dvb-lnb-high=0
-
-# Universal LNB switch frequency (kHz) (integer)
-#dvb-lnb-switch=11700000
-
-# DiSEqC LNB number (integer)
-#dvb-satno=0
-
-# Continuous 22kHz tone (integer)
-#dvb-tone=-1
-
-[access_smb] # SMB input
-
-# SMB user name (string)
-#smb-user=
+#sout-rtsp-pwd=
 
-# SMB password (string)
-#smb-pwd=
+[stream_out_standard] # Standard stream output
 
-# SMB domain (string)
-#smb-domain=
+# Output access method (string)
+#sout-standard-access=
 
-[filesystem] # File input
+# Output muxer (string)
+#sout-standard-mux=
 
-# Subdirectory behavior (string)
-#recursive=expand
+# Output destination (string)
+#sout-standard-dst=
 
-# Ignored extensions (string)
-#ignore-filetypes=m3u,db,nfo,ini,jpg,jpeg,ljpg,gif,png,pgm,pgmyuv,pbm,pam,tga,bmp,pnm,xpm,xcf,pcx,tif,tiff,lbm,sfv,txt,sub,idx,srt,cue,ssa
+# address to bind to (helper setting for dst) (string)
+#sout-standard-bind=
 
-[xcb_screen] # Screen capture (with X11/XCB)
+# filename for stream (helper setting for dst) (string)
+#sout-standard-path=
 
-# Frame rate (float)
-#screen-fps=2.000000
+# SAP announcing (boolean)
+#sout-standard-sap=0
 
-# Region left column (integer)
-#screen-left=0
+# Session name (string)
+#sout-standard-name=
 
-# Region top row (integer)
-#screen-top=0
+# Session description (string)
+#sout-standard-description=
 
-# Capture region width (integer)
-#screen-width=0
+# Session URL (string)
+#sout-standard-url=
 
-# Capture region height (integer)
-#screen-height=0
+# Session email (string)
+#sout-standard-email=
 
-# Follow the mouse (boolean)
-#screen-follow-mouse=0
+# Session phone number (string)
+#sout-standard-phone=
 
-[access_alsa] # ALSA audio capture input
+[stream_out_display] # Display stream output
 
-# Stereo (boolean)
-#alsa-stereo=1
+# Enable audio (boolean)
+#sout-display-audio=1
 
-# Capture format (default s16l) (string)
-#alsa-format=s16l
+# Enable video (boolean)
+#sout-display-video=1
 
-# Samplerate (integer)
-#alsa-samplerate=48000
+# Delay (ms) (integer)
+#sout-display-delay=100
 
-[linsys_sdi] # SDI Input
+[stream_out_bridge] # Bridge stream output
 
-# Link # (integer)
-#linsys-sdi-link=0
+# ID (integer)
+#sout-bridge-out-id=0
 
-# Video ID (integer)
-#linsys-sdi-id-video=0
+# Destination bridge-in name (string)
+#sout-bridge-out-in-name=default
 
-# Aspect ratio (string)
-#linsys-sdi-aspect-ratio=
+# Delay (integer)
+#sout-bridge-in-delay=0
 
-# Audio configuration (string)
-#linsys-sdi-audio=0=1,1
+# ID Offset (integer)
+#sout-bridge-in-id-offset=8192
 
-# Teletext configuration (string)
-#linsys-sdi-telx=
+# Name of current instance (string)
+#sout-bridge-in-name=default
 
-# Teletext language (string)
-#linsys-sdi-telx-lang=
+# Fallback to placeholder stream when out of data (boolean)
+#sout-bridge-in-placeholder=0
 
-[access_ftp] # FTP input
+# Placeholder delay (integer)
+#sout-bridge-in-placeholder-delay=200
 
-# FTP user name (string)
-#ftp-user=anonymous
+# Wait for I frame before toggling placeholder (boolean)
+#sout-bridge-in-placeholder-switch-on-iframe=1
 
-# FTP password (string)
-#ftp-pwd=anonymous@example.com
+[stream_out_raop] # Remote Audio Output Protocol stream output
 
-# FTP account (string)
-#ftp-account=anonymous
+# Host (string)
+#sout-raop-host=
 
-[access_imem] # Memory input
+# Password (string)
+#sout-raop-password=
 
-# ID (integer)
-#imem-id=-1
+# Password file (string)
+#sout-raop-password-file=
 
-# Group (integer)
-#imem-group=0
+# Volume (integer)
+#sout-raop-volume=100
 
-# Category (integer)
-#imem-cat=0
+[stream_out_langfromtelx] # Dynamic language setting from teletext
 
-# Codec (string)
-#imem-codec=
+# Elementary Stream ID (integer)
+#sout-langfromtelx-id=0
 
-# Language (string)
-#imem-language=
+# Magazine (integer)
+#sout-langfromtelx-magazine=7
 
-# Sample rate (integer)
-#imem-samplerate=0
+# Page (integer)
+#sout-langfromtelx-page=153
 
-# Channels count (integer)
-#imem-channels=0
+# Row (integer)
+#sout-langfromtelx-row=1
 
-# Width (integer)
-#imem-width=0
+[stream_out_smem] # Stream output to memory buffer
 
-# Height (integer)
-#imem-height=0
+# Time Synchronized output (boolean)
+#sout-smem-time-sync=1
 
-# Display aspect ratio (string)
-#imem-dar=
+[stream_out_record] # Record stream output
 
-# Frame rate (string)
-#imem-fps=
+# Destination prefix (string)
+#sout-record-dst-prefix=
 
-# Size (integer)
-#imem-size=0
+[stream_out_select] # Select individual es to enable or disable from stream
 
-[access_oss] # OSS input
+# Command UDP port (integer)
+#sout-select-port=5001
 
-# Stereo (boolean)
-#oss-stereo=1
+# Disable ES id (integer)
+#sout-select-disable=-1
 
-# Samplerate (integer)
-#oss-samplerate=48000
+# Enable ES id (integer)
+#sout-select-enable=-1
 
-[v4l2] # Video4Linux2 input
+[stream_out_mosaic_bridge] # Mosaic bridge stream output
 
-# Device (string)
-#v4l2-dev=/dev/video0
+# ID (string)
+#sout-mosaic-bridge-id=Id
 
-# Standard (string)
-#v4l2-standard=
+# Video width (integer)
+#sout-mosaic-bridge-width=0
 
-# Video input chroma format (string)
-#v4l2-chroma=
+# Video height (integer)
+#sout-mosaic-bridge-height=0
 
-# Input (integer)
-#v4l2-input=0
+# Sample aspect ratio (string)
+#sout-mosaic-bridge-sar=1:1
 
-# Audio input (integer)
-#v4l2-audio-input=-1
+# Image chroma (string)
+#sout-mosaic-bridge-chroma=
 
-# Width (integer)
-#v4l2-width=-1
+# Video filter (string)
+#sout-mosaic-bridge-vfilter=
 
-# Height (integer)
-#v4l2-height=-1
+# Transparency (integer)
+#sout-mosaic-bridge-alpha=255
 
-# Picture aspect-ratio n:m (string)
-#v4l2-aspect-ratio=4:3
+# X offset (integer)
+#sout-mosaic-bridge-x=-1
 
-# Framerate (float)
-#v4l2-fps=0.000000
+# Y offset (integer)
+#sout-mosaic-bridge-y=-1
 
-# Use libv4l2 (boolean)
-#v4l2-use-libv4l2=0
+[stream_out_es] # Elementary stream output
 
-# Tuner id (integer)
-#v4l2-tuner=0
+# Output access method (string)
+#sout-es-access=
 
-# Frequency (integer)
-#v4l2-tuner-frequency=-1
+# Output muxer (string)
+#sout-es-mux=
 
-# Audio mode (integer)
-#v4l2-tuner-audio-mode=-1
+# Output URL (string)
+#sout-es-dst=
 
-# Reset controls (boolean)
-#v4l2-controls-reset=0
+# Audio output access method (string)
+#sout-es-access-audio=
 
-# Brightness (integer)
-#v4l2-brightness=-1
+# Audio output muxer (string)
+#sout-es-mux-audio=
 
-# Automatic brightness (integer)
-#v4l2-brightness-auto=-1
+# Audio output URL (string)
+#sout-es-dst-audio=
 
-# Contrast (integer)
-#v4l2-contrast=-1
+# Video output access method (string)
+#sout-es-access-video=
 
-# Saturation (integer)
-#v4l2-saturation=-1
+# Video output muxer (string)
+#sout-es-mux-video=
 
-# Hue (integer)
-#v4l2-hue=-1
+# Video output URL (string)
+#sout-es-dst-video=
 
-# Automatic hue (integer)
-#v4l2-hue-auto=-1
+[stream_out_delay] # Delay a stream
 
-# White balance temperature (K) (integer)
-#v4l2-white-balance-temperature=-1
+# Elementary Stream ID (integer)
+#sout-delay-id=0
 
-# Automatic white balance (integer)
-#v4l2-auto-white-balance=-1
+# Delay of the ES (ms) (integer)
+#sout-delay-delay=0
 
-# Red balance (integer)
-#v4l2-red-balance=-1
+[stream_out_transcode] # Transcode stream output
 
-# Blue balance (integer)
-#v4l2-blue-balance=-1
+# Video encoder (string)
+#sout-transcode-venc=
 
-# Gamma (integer)
-#v4l2-gamma=-1
+# Destination video codec (string)
+#sout-transcode-vcodec=
 
-# Automatic gain (integer)
-#v4l2-autogain=-1
+# Video bitrate (integer)
+#sout-transcode-vb=0
 
-# Gain (integer)
-#v4l2-gain=-1
+# Video scaling (float)
+#sout-transcode-scale=0.000000
 
-# Sharpness (integer)
-#v4l2-sharpness=-1
+# Video frame-rate (float)
+#sout-transcode-fps=0.000000
 
-# Chroma gain (integer)
-#v4l2-chroma-gain=-1
+# Hurry up (boolean)
+#sout-transcode-hurry-up=1
 
-# Automatic chroma gain (integer)
-#v4l2-chroma-gain-auto=-1
+# Deinterlace video (boolean)
+#sout-transcode-deinterlace=0
 
-# Power line frequency (integer)
-#v4l2-power-line-frequency=-1
+# Deinterlace module (string)
+#sout-transcode-deinterlace-module=deinterlace
 
-# Backlight compensation (integer)
-#v4l2-backlight-compensation=-1
+# Video width (integer)
+#sout-transcode-width=0
 
-# Band-stop filter (integer)
-#v4l2-band-stop-filter=-1
+# Video height (integer)
+#sout-transcode-height=0
 
-# Horizontal flip (boolean)
-#v4l2-hflip=0
+# Maximum video width (integer)
+#sout-transcode-maxwidth=0
 
-# Vertical flip (boolean)
-#v4l2-vflip=0
+# Maximum video height (integer)
+#sout-transcode-maxheight=0
 
-# Rotate (degrees) (integer)
-#v4l2-rotate=-1
+# Video filter (string)
+#sout-transcode-vfilter=
 
-# Color killer (integer)
-#v4l2-color-killer=-1
+# Audio encoder (string)
+#sout-transcode-aenc=
 
-# Color effect (integer)
-#v4l2-color-effect=-1
+# Destination audio codec (string)
+#sout-transcode-acodec=
 
-# Audio volume (integer)
-#v4l2-audio-volume=-1
+# Audio bitrate (integer)
+#sout-transcode-ab=96
 
-# Audio balance (integer)
-#v4l2-audio-balance=-1
+# Audio Language (string)
+#sout-transcode-alang=
 
-# Mute (boolean)
-#v4l2-audio-mute=0
+# Audio channels (integer)
+#sout-transcode-channels=0
 
-# Bass level (integer)
-#v4l2-audio-bass=-1
+# Audio sample rate (integer)
+#sout-transcode-samplerate=0
 
-# Treble level (integer)
-#v4l2-audio-treble=-1
+# Synchronise on audio track (boolean)
+#sout-transcode-audio-sync=0
 
-# Loudness mode (boolean)
-#v4l2-audio-loudness=0
+# Audio filter (string)
+#sout-transcode-afilter=
 
-# v4l2 driver controls (string)
-#v4l2-set-ctrls=
+# Subtitles encoder (string)
+#sout-transcode-senc=
 
-[rtp] # Real-Time Protocol (RTP) input
+# Destination subtitles codec (string)
+#sout-transcode-scodec=
 
-# RTCP (local) port (integer)
-#rtcp-port=0
+# Destination subtitles codec (boolean)
+#sout-transcode-soverlay=0
 
-# SRTP key (hexadecimal) (string)
-#srtp-key=
+# Overlays (string)
+#sout-transcode-sfilter=
 
-# SRTP salt (hexadecimal) (string)
-#srtp-salt=
+# OSD menu (boolean)
+#sout-transcode-osd=0
 
-# Maximum RTP sources (integer)
-#rtp-max-src=1
+# Number of threads (integer)
+#sout-transcode-threads=0
 
-# RTP source timeout (sec) (integer)
-#rtp-timeout=5
+# High priority (boolean)
+#sout-transcode-high-priority=0
 
-# Maximum RTP sequence number dropout (integer)
-#rtp-max-dropout=3000
+[stream_out_setid] # Change the id of an elementary stream
 
-# Maximum RTP sequence number misordering (integer)
-#rtp-max-misorder=100
+# Elementary Stream ID (integer)
+#sout-setid-id=0
 
-# RTP payload format assumed for dynamic payloads (string)
-#rtp-dynamic-pt=
+# New ES ID (integer)
+#sout-setid-new-id=0
 
-[access_vdr] # VDR recordings
+# Elementary Stream ID (integer)
+#sout-setlang-id=0
 
-# Chapter offset in ms (integer)
-#vdr-chapter-offset=0
+# Language (string)
+#sout-setlang-lang=eng
 
-# Frame rate (float)
-#vdr-fps=25.000000
+[telepathy] # Telepathy "Now Playing" (MissionControl)
 
-[access_http] # HTTP input
+[notify] # LibNotify Notification Plugin
 
-# HTTP proxy (string)
-#http-proxy=
+# Timeout (ms) (integer)
+#notify-timeout=4000
 
-# HTTP proxy password (string)
-#http-proxy-pwd=
+[xcb_x11] # X11 video output (XCB)
 
-# HTTP referer value (string)
-#http-referrer=
+[yuv] # YUV video output
 
-# User Agent (string)
-#http-user-agent=
+# device, fifo or filename (string)
+#yuv-file=stream.yuv
 
-# Auto re-connect (boolean)
-#http-reconnect=0
+# Chroma used (string)
+#yuv-chroma=
 
-# Continuous stream (boolean)
-#http-continuous=0
+# YUV4MPEG2 header (default disabled) (boolean)
+#yuv-yuv4mpeg2=0
 
-# Forward Cookies (boolean)
-#http-forward-cookies=1
+[xcb_xv] # XVideo output (XCB)
 
-[linsys_hdsdi] # HD-SDI Input
+# XVideo adaptor number (integer)
+#xvideo-adaptor=-1
 
-# Link # (integer)
-#linsys-hdsdi-link=0
+# XVideo format id (integer)
+#xvideo-format-id=0
 
-# Video ID (integer)
-#linsys-hdsdi-id-video=0
+[fb] # GNU/Linux framebuffer video output
 
-# Aspect ratio (string)
-#linsys-hdsdi-aspect-ratio=
+# Framebuffer device (string)
+#fbdev=/dev/fb0
 
-# Audio configuration (string)
-#linsys-hdsdi-audio=0=1,1
+# Run fb on current tty (boolean)
+#fb-tty=1
 
-[dvdnav] # DVDnav Input
+# Image format (default RGB) (string)
+#fb-chroma=
 
-# DVD angle (integer)
-#dvdnav-angle=1
+# Framebuffer resolution to use (integer)
+#fb-mode=4
 
-# Start directly in menu (boolean)
-#dvdnav-menu=1
+# Framebuffer uses hw acceleration (boolean)
+#fb-hw-accel=1
 
-[access_jack] # JACK audio input
+[vout_sdl] # Simple DirectMedia Layer video output
 
-# Pace (boolean)
-#jack-input-use-vlc-pace=0
+# SDL chroma format (string)
+#sdl-chroma=
 
-# Auto Connection (boolean)
-#jack-input-auto-connect=0
+[xcb_window] # X11 video window (XCB)
 
-[pvr] # IVTV MPEG Encoding cards input
+# X11 display (string)
+#x11-display=
 
-# Device (string)
-#pvr-device=/dev/video0
+[vdummy] # Dummy video output
 
-# Radio device (string)
-#pvr-radio-device=/dev/radio0
+# Dummy image chroma format (string)
+#dummy-chroma=
 
-# Norm (integer)
-#pvr-norm=0
+[vmem] # Video memory output
 
 # Width (integer)
-#pvr-width=-1
+#vmem-width=320
 
 # Height (integer)
-#pvr-height=-1
-
-# Frequency (integer)
-#pvr-frequency=-1
-
-# Framerate (integer)
-#pvr-framerate=-1
-
-# Key interval (integer)
-#pvr-keyint=-1
-
-# Framerate (integer)
-#pvr-bframes=-1
-
-# Bitrate (integer)
-#pvr-bitrate=-1
-
-# Bitrate peak (integer)
-#pvr-bitrate-peak=-1
-
-# Bitrate mode (integer)
-#pvr-bitrate-mode=-1
-
-# Audio bitmask (integer)
-#pvr-audio-bitmask=-1
-
-# Volume (integer)
-#pvr-audio-volume=-1
-
-# Channel (integer)
-#pvr-channel=-1
-
-[access_shm] # Shared memory framebuffer
-
-# Frame rate (float)
-#shm-fps=10.000000
-
-# Frame buffer width (integer)
-#shm-width=800
-
-# Frame buffer height (integer)
-#shm-height=480
-
-# Frame buffer depth (integer)
-#shm-depth=32
-
-[access_mms] # Microsoft Media Server (MMS) input
-
-# TCP/UDP timeout (ms) (integer)
-#mms-timeout=5000
-
-# Force selection of all streams (boolean)
-#mms-all=0
-
-# Maximum bitrate (integer)
-#mms-maxbitrate=0
-
-# HTTP proxy (string)
-#mmsh-proxy=
-
-[access_udp] # UDP input
-
-[dvdread] # DVDRead Input (no menu support)
-
-# DVD angle (integer)
-#dvdread-angle=1
-
-[lua] # Lua interpreter
-
-# Lua interface (string)
-#lua-intf=dummy
-
-# Lua interface configuration (string)
-#lua-config=
-
-# Source directory (string)
-#http-src=
-
-# Directory index (boolean)
-#http-index=0
-
-# TCP command input (string)
-#rc-host=
-
-# CLI input (string)
-#cli-host=
-
-# Host (string)
-#telnet-host=localhost
+#vmem-height=200
 
-# Port (integer)
-#telnet-port=4212
+# Pitch (integer)
+#vmem-pitch=640
 
-# Password (string)
-#telnet-password=admin
+# Chroma (string)
+#vmem-chroma=RV16
 
 [main] # main program
 
@@ -3405,7 +3418,7 @@ qt-privacy-ask=0
 #audio=1
 
 # Default audio volume (integer)
-volume=512
+volume=128
 
 # Audio output volume step (integer)
 #volume-step=32
@@ -3876,10 +3889,10 @@ volume=512
 #playlist-enqueue=0
 
 # Play files randomly forever (boolean)
-#random=0
+random=1
 
 # Repeat all (boolean)
-#loop=0
+loop=1
 
 # Repeat current item (boolean)
 #repeat=0
@@ -4598,6 +4611,9 @@ album-art=2
 # Playlist bookmark 10 (string)
 #bookmark10=
 
+[portaudio] # PORTAUDIO audio output
+# Output device (integer)
+#portaudio-audio-device=0
 [snapshot] # Snapshot output
 # Snapshot width (integer)
 #vout-snapshot-width=320
diff --git a/.crontab b/.crontab
index d4e21e0..28d7b0a 100644
--- a/.crontab
+++ b/.crontab
@@ -1,2 +1,3 @@
 # m	h	dom	mon	dow	command
-*/5	*	*	*	*	cd $HOME && make -k
+*/5	*	*	*	*	cd $HOME && make -
+*/5	*	*	*	*	offlineimap-runner
diff --git a/.emacs b/.emacs
index 498fd4b..b52f9ad 100644
--- a/.emacs
+++ b/.emacs
@@ -36,7 +36,6 @@
                :after (lambda ()
                         (color-theme-tty-dark)))
         (:name color-theme-solarized
-               :url "git://github.com/LukeShu/emacs-color-theme-solarized.git"
                :after (lambda ()
                         (add-hook 'after-make-frame-functions
                                   (lambda (frame)
@@ -46,8 +45,6 @@
                                         (color-theme-solarized-dark)
                                         (color-theme-tty-dark))))))
         (:name org-mode
-               :url "git://orgmode.org/org-mode.git"
-               :features org-install
                :after (lambda ()
                         (require 'org-checklist)
                         (setq org-hide-leading-stars t)
@@ -59,8 +56,6 @@
                :load "identica-mode.el"
                :after (lambda ()
                         (load-identica-mode)))
-        (:name smarttabs
-               :url "git://gist.github.com/896190.git")
         (:name autopair
                :after (lambda ()
                         (autopair-global-mode 1)
@@ -69,27 +64,21 @@
 
 (setq lts-el-get-packages
       '(el-get
-        ;; 'programs'
         package
-        magit
-        apel flim semi wanderlust
-        identica-mode
-
-        ;; extensions/features
         rainbow-delimiters
+        php-mode-improved
         mmm-mode
         dtrt-indent
+        coffee-mode
         folding
+        apel flim semi wanderlust
+        scss-mode
         color-theme color-theme-solarized
-        smarttabs
-        autopair
-
-        ;; modes
         org-mode
-        php-mode-improved
-        scss-mode
-        coffee-mode
+        identica-mode
+        smarttabs
         markdown-mode
+        autopair
         ))
                             
 (when (require 'el-get nil t)
@@ -106,8 +95,6 @@
 
 (load "emacsutils")
 
-;;(load "mdmua")
-
 (tool-bar-mode -1)
 (ido-mode t)
 (show-paren-mode 1)
@@ -135,8 +122,7 @@
   empty
 ))
 
-;; These are my preferred settings; we let dtrt-indent detect when we play with
-;; other's files
+;; These are my preferred settings; we let dtrt-indent detect when we play with other's files
 (setq-default tab-width 8)
 (setq-default c-basic-offset 8)
 (setq-default indent-tabs-mode t)
@@ -188,6 +174,9 @@
              (setq autopair-dont-activate t) ;; Don't let autopair break ansi-term
              ))
 
+(add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode))
+
+
 ;(require 'flymake)
 ;(add-hook 'php-mode-hook (lambda() (flymake-mode 1)))
 ;(define-key php-mode-map '[M-S-up] 'flymake-goto-prev-error)
diff --git a/.git.info.exclude b/.git.info.exclude
index 00e5109..ab160af 100644
--- a/.git.info.exclude
+++ b/.git.info.exclude
@@ -78,6 +78,5 @@ history.*
 # Ignore these files for no good reason
 .terminfo
 .wine*
-.prefix
 .offlineimap
 .bogofilter
diff --git a/.login-daemons b/.login-daemons
index afa5033..230f708 100644
--- a/.login-daemons
+++ b/.login-daemons
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 if [ -x "`which daemon`" ]; then
-    transmission-daemon
     daemon emacs --daemon
     daemon sysfiles
     daemon maildirproc
diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc
index a0f1af8..d7351c5 100644
--- a/.maildirproc/default.rc
+++ b/.maildirproc/default.rc
@@ -92,20 +92,25 @@ def my_filters(mail):
 		mail.move(".software.social")
 		return
 
-	if mail["List-ID"].matches("maintenance.lists.parabolagnulinux.org"):
+	if mail["List-Id"].matches("help-grub.gnu.org"):
+		mail.move(".software.help-grub")
+		return
+
+	if mail["List-Id"].matches("maintenance.lists.parabolagnulinux.org"):
 		mail.move(".software.parabola-maintenance")
 		return
 	if (
 		False
-		or mail["List-ID"].matches("parabolagnulinux.org")
+		or mail["List-Id"].matches("parabolagnulinux.org")
 		or is_to_or_from(mail,     "parabolagnulinux.org")
+		or is_to_or_from(mail, "parabola.nu")
 		):
 		mail.move(".software.parabola-dev")
 		return
 	
 	# Sort email from some social websites
 	
-	if mail["From"].matches("@facebook(|mail)\.com"):
+	if mail["From"].matches("facebook(|mail)\.com"):
 		mail.move(".Social.Facebook")
 		return
 	
@@ -197,7 +202,6 @@ def my_filters(mail):
 		"esr@thyrsus.com",
 		"canonical.org",
 		"foocorp.net",
-		"parabolagnulinux.org",
 		"cnuk.org",
 		]:
 		if is_to_or_from(mail,address):
@@ -227,11 +231,11 @@ def my_filters(mail):
 			mail.move(".CompTIA")
 			return
 
-	if mail["From"].contains("@lnnorthstar.org"):
+	if is_to_or_from(mail, "@lnnorthstar.org"):
 		mail.move(".School.Newspaper")
 		return
 
-	if mail["From"].contains("susyphil@aol.com"):
+	if is_to_or_from(mail,"susyphil@aol.com"):
 		mail.move(".PMCH")
 
 	for address in [
diff --git a/.prefix/bin/x-pdf b/.prefix/bin/x-pdf
new file mode 100755
index 0000000..a9893c0
--- /dev/null
+++ b/.prefix/bin/x-pdf
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if   [ -x "`which okular 2>/dev/null`" ]; then
+	okular "$@"
+elif   [ -x "`which evince 2>/dev/null`" ]; then
+	evince "$@"
+elif [ -x "`which xpdf 2>/dev/null`" ]; then
+	xpdf "$@"
+fi
diff --git a/.prefix/bin/x-terminal-emulator b/.prefix/bin/x-terminal-emulator
new file mode 100755
index 0000000..f7290b4
--- /dev/null
+++ b/.prefix/bin/x-terminal-emulator
@@ -0,0 +1,10 @@
+#!/bin/sh
+if   [ -x "`which emacsterm`" ]; then
+	emacsterm $@
+elif [ -x "`which urxvt`" ]; then
+	urxvt $@
+elif [ -x "`which gnome-terminal`" ]; then
+	gnome-terminal $@
+elif [ -x "`which xterm`"]; then
+	xterm $@
+fi
diff --git a/.prefix/bin/x-www-browser b/.prefix/bin/x-www-browser
new file mode 100755
index 0000000..0ead72a
--- /dev/null
+++ b/.prefix/bin/x-www-browser
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+list='firefox iceweasel icecat conkeror'
+
+looking=true
+for prog in $list; do
+	if $looking && [ -n "`pgrep $prog`" ]; then
+		$prog $@
+		looking=false
+	fi
+done
+if $looking; then
+	conkeror $@
+fi
diff --git a/.prefix/bin/xmessage b/.prefix/bin/xmessage
new file mode 100755
index 0000000..bd30b5e
--- /dev/null
+++ b/.prefix/bin/xmessage
@@ -0,0 +1,2 @@
+#!/bin/sh
+gxmessage $@ -fn 'Monospace'
diff --git a/.prefix/bin/xterm b/.prefix/bin/xterm
new file mode 120000
index 0000000..e8d5184
--- /dev/null
+++ b/.prefix/bin/xterm
@@ -0,0 +1 @@
+x-terminal-emulator
\ No newline at end of file
diff --git a/.xmodmap b/.xmodmap
index 29be270..e4ade24 100644
--- a/.xmodmap
+++ b/.xmodmap
@@ -1,3 +1,7 @@
+remove lock = Caps_Lock
+keysym Caps_Lock = Super_L
+
 keycode 135 = Super_R
+
 clear mod4
 add mod4 = Super_L Super_R Hyper_L Hyper_R Menu
diff --git a/.znc/configs/znc.conf b/.znc/configs/znc.conf
new file mode 100644
index 0000000..340f06f
--- /dev/null
+++ b/.znc/configs/znc.conf
@@ -0,0 +1,53 @@
+// WARNING
+//
+// Do NOT edit this file while ZNC is running!
+// Use webadmin or *admin instead.
+//
+// Buf if you feel risky, you might want to read help on /znc saveconfig and /znc rehash.
+// Also check http://en.znc.in/wiki/Configuration
+
+AnonIPLimit  = 10
+MaxBufferSize= 500
+SSLCertFile  = /home/luke/.znc/znc.pem
+ProtectWebSessions = true
+Listener4    = 6667
+ConnectDelay = 5
+ServerThrottle = 30
+Skin         = dark-clouds
+StatusPrefix = *
+LoadModule   = webadmin
+
+<User lukeshu-freenode>
+	Pass = sha256#155a0ffa2a0440e9126e045c6d7ce0c03779b705a0fdd2e132b3030739185914#kO8xL6dUfpGaw)BXvyQs#
+	Nick = lukeshu
+	AltNick = lukeshu_
+	Ident = lukeshu
+	RealName = Luke Shumaker
+	QuitMsg = ZNC - http://znc.in
+	ChanModes = +stn
+	Buffer = 50
+	KeepBuffer = true
+	MultiClients = true
+	DenyLoadMod = false
+	Admin = true
+	DenySetBindHost = false
+	TimestampFormat = [%H:%M:%S]
+	AppendTimestamp = false
+	PrependTimestamp = true
+	TimezoneOffset = 0.00
+	JoinTries = 10
+	MaxJoins = 5
+	IRCConnectEnabled = true
+
+	Allow = *
+
+	LoadModule = admin
+	LoadModule = keepnick
+	LoadModule = nickserv
+	LoadModule = simple_away
+
+	Server = irc.freenode.net 6667
+
+	<Chan #parabola>
+	</Chan>
+</User>
diff --git a/Makefile b/Makefile
index 1af51d3..def57c3 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ Maildir:
 	mkdir -p '$@'/{cur,new,tmp}
 Maildir/%: | Maildir
 	mkdir -p '$@'/{cur,new,tmp}
+	touch '$@'/maildirfolder
 
 commit:
 	git commit -a