(cherry picked from commit cbccd7297c241830e796f0f239b4b90d19c16c75)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

No need to backport this, as 1.0-bugfix only includes classic nibs

"daemon" is kept as the default, other accepted values are for now
"user" and "local0" through "local7"

Conflicts:

	modules/access/qtcapture.m

Seperate config options from the configtree. VLCTreeItem and VLCTreeLeafItem
are now used for CONFIG_ITEM in an options collection. It now works, but
probably should be cleanup up a bit more, with better seperation between the
disjunct elements of Tree and ConfigItems.

This was broken since [09e31e1436ef3e670bd7497688272dd073c8d3a6]
(cherry picked from commit 1e7e2ae9)

set/(re)move a few cases of set_category and set_subcategory
(cherry picked from commit c1823412)

(still some issues that I will fixe later on)

Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Without this, ffmpeg refuses to build due to licensing problems.

(tested under Scratchbox-based public Beta SDK)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

small ones. The result is not necesserally faster but easier to change/fix.

This was broken in [3d5ff7dc]

Conflicts:

	src/input/input.c

I'm not sure that VLC can't still leak memory in this case...

Remove duplicate " :"

New features (audio and subtitles) added.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>