Sorry, I failed my merge ;)

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

 * modules/access/linsys/*: add support for SDI and HD-SDI cards of
   Linear Systems/Computer Modules
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

It is behaving a little bit different from the libxml parser which has
caused weird bugs in the past. Anyway, everybody has libxml (I am
planning to write an Expat parser too but not there yet).

commit id: c5f5039b defined
a shadow variable psz_path which content is needed to correctly
construct a relative_URI().

If Prefetch() decides that playback cannot commence it returns VLC_EGENERIC. The
code path in Open() tries to cleanup by calling Close(). However at that point the
hls_Thread() is not started yet and this causes a crash in Close().

The resolution is to not call Close() but cleanup the parts that have been created
in the Open() function itself.

httplive crashed in parse_SegmentInformation on line 428. The cause is
that hls->url.psz_path can be NULL, when there is no meta playlist involved.
In that situation it results in a crash of vlc. (Issue reported by Felix Kuehne.)

(Refer to the previous commit for rationale)

In older VLC versions, we had to use the same X11 display for the
window provider (the UI) and the video outputs to avoid Xlib aborts.
We do not need this anymore. Morever, the XCB outputs can detect the
error and fail safe.

To change the UI display, the DISPLAY environment variable is used.
The only real use case for --x11-display is output to a different
display than that of the UI. This change restores this use case,
and simplifies the Qt4 interface.

Bug: right-click on an empty node leads to a segfault

It was broken a looong time ago because the XML structure
of their web page is broken

File paths without file:// don't work anymore

MOC files should not be created if the ML is not built

doDelete() should be virtual
getMeta() and getArtPixmap() helpers in VLCModel

This will need a proper fix once both Xcode 3 and 4 are available.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>