'Edit Sort Title' should show acutal sort string
Merge pull request #3138 from Fice/editSortTitle

'Edit Sort Title' should show actual sort string
fix compile after e0c7bba39023b5ac62309cbfcd4aa0f6867307eb
xbmc/utils/BitstreamConverter.{cpp,h}: s/CodecID/AVCodecID/, fixes compile with external ffmpeg >=2.0
[Touched] update skin
Merge pull request #3147 from herrnst/avcodecid2

xbmc/utils/BitstreamConverter.{cpp,h}: s/CodecID/AVCodecID/, fixes compile with external ffmpeg >=2.0
ffmpeg: add av_channel_layout_extract_channel to util interface
ActiveAE: fix stereo upmix
[settings] libstagefright setting should be in android.xml
Merge pull request #3151 from MartijnKaijser/settings_stagefright

[settings] libstagefright setting should be in android.xml
Merge pull request #3146 from FernetMenta/aefixes

ActiveAE: fix stereo upmix
[GuiLib] Prefix ++/-- operators should be preferred for non-primitive types.
[GuiLib] Technically the member function 'Foo::bar' can be static.
[GuiLib]  Possible inefficient checking for 'foo' emptiness.
[GuiLib]  Variable 'foo' is reassigned a value before the old one has been used.
[JpegIO] Common realloc mistake: 'm_inputBuff' nulled but not freed upon failure.
[GuiLib] Technically the member function 'Foo::bar' can be const.
[DirectXGraphics] Checking if unsigned variable 'foo' is less than zero.
[GuiLib] The scope of the variable 'foo' can be reduced.
[GuiLib] 'Foo::operator=' should return 'Foo &'.