For reference, this is the one line patch Mikko supplied:
diff --git a/lib/ffmpeg/libavformat/matroska.c b/lib/ffmpeg/libavformat/matroska
index c7e9663..dd22ccd 100644
--- a/lib/ffmpeg/libavformat/matroska.c
+++ b/lib/ffmpeg/libavformat/matroska.c
@@ -59,6 +59,7 @@ const CodecTags ff_mkv_codec_tags[]={
{"S_ASS" , CODEC_ID_SSA},
{"S_SSA" , CODEC_ID_SSA},
{"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE},
+ {"S_DVBSUB" , CODEC_ID_DVB_SUBTITLE},
{"S_HDMV/PGS" , CODEC_ID_HDMV_PGS_SUBTITLE},
{"V_DIRAC" , CODEC_ID_DIRAC},
I considered requesting Dushmaniac to include the patch in xbmc-pvr, but if Andreas could make tvheadend convert it to VOBSUB, I guess that would be better (i.e. less need to convince a lot of other projects to the tvheadend way of putting subs in mkv). I'm not sure from Andreas' response if this is easy to do and/or could be done soon... If not, I guess a xbmc-pvr fix would be nice for the time being.