gsmer: replace custom types with standard ones
Merge branch 'gsmer' into codecs-fixes-20141025