Thedj work on zvbi support with some cleanup from me and backported to vlc-0.8.6b. The change in modules/demux/ts.c cannot be checked into the archive because it breaks the telx.c module.

Revert [20519] as time display is a bit too wide now (at least on XP, the defaults were fine). Needs more tweaking to be properly backported.

...assuming you have non-buggy calloc() implementation.

Pointed-out-by: Drew Yao
Signed-off-by: Rémi Denis-Courmont <rem@videolan.org>

Signed-off-by: Rémi Denis-Courmont <rem@videolan.org>

Pointed-out-by: Drew Yao
Signed-off-by: Rémi Denis-Courmont <rem@videolan.org>

This fixes those annoying messages:
[00000307] main audio output debug: audio output is starving (38397), playing silence
[00000307] alsa audio output debug: recovered from buffer underrun
and sound becomes just fine.
Tested on 32bit and x86_64 systems.

* modules/audio_filter/channel_mixer/simple.c: revert mistaken commit of simple.c (aac channel order fix keeps haunting me)

* modules/demux/mkv.cpp: backport [19988] apply open probes when checking .mkv in same folder; fix memleak and fix crash when there are multiple .mkv and one of them is corrupt or incomplete

* modules/codec/faad.c: revert [25155] channel order fix since it needs more than also backporting [23226] simple.c so revert for now until we have something that applies to bugfix

* mozilla/control/npolibvlc.cpp: backport [25203] fixed name argument in add(url, name, options) for mozilla