ffmpeg: Bump to 2.2-Helix-alpha2 - rebased on 2.2.4
tvshowmatching: match names without season (foo.E01)
tvshowmatching: allow digits after 'part'. e.g. foo.part.1
Fixed: Manual loading of VobSub subtitles

Currently VobSub (.idx/.sub) subtitles can not be loaded manually.

Allow loading VobSub subtitles manually by specifying either the .idx
or the .sub file. The other file is detected automatically. The
following naming schemes are supported:
- foobar.idx and foobar.sub
- foobar.idx and foobar.(rar|zip) containing foobar.sub

All of the above can be inside an archive (commonly .rar) as well, in
which case the user can select either .idx or .rar inside the archive.
Fixed: Subtitles autoloading with both VobSub and MicroDVD files

For example, this directory structure:
- movie.mp4
- movie.sub (MicroDVD subtitles)
- Subs/movie.rar (VobSub subtitles)
will prevent any subtitles from being actually loaded. DVDPlayer calls
IsVobSub() for any added .sub files to check if they should be ignored
(since VobSub files are supposed to be added via .idx during
autoloading, we do not want to add them a second time via .sub). In this
case IsVobSub() actually returns true even for the MicroDVD subtitles
since movie.rar contains movie.idx, which matches the name of the
MicroDVD subtitle file. Additionally, the movie.idx inside movie.rar
will actually be paired with the MicroDVD movie.sub instead of the
correct VobSub movie.sub, and will therefore fail to load.

To fix this, make the VobSub .idx/.sub pairing requirement more strict,
allowing a match only if they are in the same directory (or, as
previously allowed, .sub is rarred/zipped in an archive matching the
name of .idx).

Suggested by taxigps.
Merge pull request #4950 from Memphiz/osxfixoptical

[AE/osxsink] - fix wrong samplerate selection
Merge pull request #4955 from Memphiz/osxfixoptical2

[AE/osxsink] - fix optical usb devices with > 2 channels
[tests] - add newly added test subdir to check_dirs var (missed during addition of the osxsink unit test)
[osx/coreaudio] - add method which gets the number of channels inside a stream
[AE/osxsink] - factor the device enumeration out into its own class and unroll that big enumeration loop into logic parts
[osx/coreaudio] - split IsDigital into IsDigital and GetTransportType
[osx/coreaudio] - constify parts of CoreAudioDevice
[settings] - implement update mechanism for audiooutput setting (needed due to new setting format)
[osx] - sync xcode project
Merge pull request #4885 from sportica/collect_subtitles

Collect subtitles at the same time to prevent overlap
[webinterface.default] Sort audio tracks by track number
[configure] use central file to store xbmc version info
autogenerate xbmc version dependent files
update Xcode
[WIN32] added automatic versioning (batch file done by wsnipex)
and generate addons/xbmc.addon/addon.xml in CompileInfo.bat, thx Montellese