AE: Mark parameter of AEChannelInfo::ContainsChannels as const
AESinkALSA: Prefer opening too many channels to too few channels
AEChannelInfo: Add methods ReplaceChannel, BestMatch, AddMissingChannels
AESinkALSA: Add support for ALSA channel mapping API

Add support for the ALSA channel mapping API. This functionality
requires alsa-lib v1.0.27.

This allows
1) selection of a best-matching channel layout when multiple layouts are
   available, and
2) reporting the actual layout back to AE, instead of the ALSA default
   legacy layout which is sometimes incorrect.

In practice, this means:

1) Devices that do not use the standard ALSA layout will now have
   correct channel mapping without ALSA configuration tricks. Such
   devices include at least:
    - 1st gen NVIDIA ION
    - some 2.1 laptop speakers
    - many embedded audio devices

2) HDMI output is now possible at "proper" 2.1, 5.0 PCM layouts (and any
   of the more unusual ones, such as 4.1, 3f, 2f+1r) without resorting to
   adding empty channels as such layouts are handled currently. This
   means that the A/V receiver will now see the correct format, instead
   of the "virtual" 5.1/7.1.

3) HDMI output is now configured to use the exact layout given from AE,
   when possible, so that AE does not need to do any remapping if it
   does not want to (the audio hardware will perform that instead).

4) Layouts containing the more unusual channel positions such as
   AE_CH_TFL, AE_CH_TC, etc, are now supported by the ALSA sink.
   However, currently CActiveAE::ApplySettingsToFormat() always
   force-resolves the stream layout to a standard layout, preventing
   the playback of such channels for now.

2,3,4 above require this post-v1.0.27.2 alsa-lib fix in most cases:
http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=042223c4ee9b17ba8a24bcfc4019f24b69b8310b

Some Linux kernels between 3.7 and 3.12 contain bugs in the HDA HDMI
driver causing incorrect multichannel mapping in some cases. The most
severe issues that affected common channel layouts were fixed in
November 2013 in versions 3.10.20, 3.11.9, 3.12.1, the rest in 3.12.15
and 3.13.

To avoid any regressions, blacklist channel mapping API on kernel
versions older than 3.12.15.
ffmpeg: Bump to 2.2-Helix-alpha2 - rebased on 2.2.4
[webinterface.default] Sort audio tracks by track number
[pvr] adjust labels for setting pvrplayback.startlast

This change the current used labels 'Yes' and 'Minimised' to 'Foreground' and 'Background', so it's easier to understand what's happen if you choose one of these options.
[pvr] remove unnecessary filler method for setting 'pvrplayback.startlast'

This removes the filler method for setting 'pvrplayback.startlast' and add options directly to the settings.xml.
[pvr] refactor: change method parameter bPreview to bMinimised to be more reasonable
[pvr] refactor enum ChannelStartLast to reflect the setting
Fixed mapping for xbmc command "eject" for device "devinput" (KEY_EJECT
not defined in linux/usr/include/input.h but KEY_EJECTCD and KEY_EJECTCLOSECD).
[videodb] fix seasons update query for mysql, which doesn't like SELECT subqueries on the same table
Merge pull request #4868 from anssih/AE/ALSA-chmaps

Add support for ALSA channel mapping API
Merge pull request #4979 from ksooo/fix-lircmap-eject-key-bindings

Fixed mapping for xbmc command "eject" for device "devinput".
ActiveAE: request best matching 5.1 layout from sink
Merge pull request #4938 from FernetMenta/channels

ActiveAE: request best matching 5.1 layout from sink
Merge pull request #4945 from fritsch/ffmpeg-2.2-helix-alpha2

ffmpeg: Bump to 2.2-Helix-alpha2 - rebased on 2.2.4
[win32] Win32SMBDirectory: fix network enumeration on Win8.1 Update 1
Thanks @Voyager1 for report
[cleanup] followup to f86b9d2884
Merge pull request #4942 from t0xicCode/patch-1

[webinterface.default] Sort audio tracks by track number