'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