[cosmetic] suppresses gcc parenthesis warning. Thx @vdrfan
keymap: fix sixaxis gamepad keymapping

Values below starting at 256 are reserved for KEY_BUTTON_*,
use some other unused key id for the GUIDE button. This button
is only virtual since it's mapped from a CEC event
jni: consmetic refactor to consistent appearance
jni: fixed build, these do not exist here
cosmetics: correct typo in DVDPlayerCodec.cpp
Merge pull request #2914 from manio/patch-1

cosmetics: correct typo in DVDPlayerCodec.cpp
[release] version bump to 13.0 alpha6 as we start new merge window.
Merge pull request #2915 from MartijnKaijser/bump

[release] version bump to 13.0 alpha6 as we start new merge window.
Replace deprecated CodedID and CODEC_ID by their av prefixed counterparts.
Merge pull request #2878 from aballier/codecid

Replace deprecated CodecID and CODEC_ID_* by AVCodecID and AV_CODEC_ID_* everywhere in xbmc code.
Merge git://github.com/xbmc/xbmc alpha 6