diff --git a/metadata.c b/metadata.c index 4781db7..04ed27c 100644 --- a/metadata.c +++ b/metadata.c @@ -862,6 +862,10 @@ GetVideoMetadata(const char *path, const char *name) xasprintf(&m.mime, "video/x-matroska"); else if( strcmp(ctx->iformat->name, "flv") == 0 ) xasprintf(&m.mime, "video/x-flv"); + else if( strcmp(ctx->iformat->name, "rm") == 0 ) + xasprintf(&m.mime, "application/vnd.rn-realmedia"); + else if( strcmp(ctx->iformat->name, "rmvb") == 0 ) + xasprintf(&m.mime, "application/vnd.rn-realmedia-vbr"); if( m.mime ) goto video_no_dlna; @@ -1538,6 +1542,10 @@ video_no_dlna: xasprintf(&m.mime, "video/x-matroska"); else if( strcmp(ctx->iformat->name, "flv") == 0 ) xasprintf(&m.mime, "video/x-flv"); + else if( strcmp(ctx->iformat->name, "rm") == 0 ) + xasprintf(&m.mime, "application/vnd.rn-realmedia"); + else if( strcmp(ctx->iformat->name, "rmvb") == 0 ) + xasprintf(&m.mime, "application/vnd.rn-realmedia-vbr"); else DPRINTF(E_WARN, L_METADATA, "%s: Unhandled format: %s\n", path, ctx->iformat->name); } diff --git a/upnpglobalvars.h b/upnpglobalvars.h index f4bcc83..e9f22b0 100644 --- a/upnpglobalvars.h +++ b/upnpglobalvars.h @@ -172,7 +172,10 @@ "http-get:*:audio/x-wav:*," \ "http-get:*:audio/x-flac:*," \ "http-get:*:audio/x-dsd:*," \ - "http-get:*:application/ogg:*" + "http-get:*:application/ogg:*" \ + "http-get:*:application/vnd.rn-realmedia:*" \ + "http-get:*:application/vnd.rn-realmedia-vbr:*" \ + "http-get:*:video/webm:*" #define DLNA_FLAG_DLNA_V1_5 0x00100000 #define DLNA_FLAG_HTTP_STALLING 0x00200000 diff --git a/utils.c b/utils.c index dc936f9..03ba850 100644 --- a/utils.c +++ b/utils.c @@ -404,7 +404,9 @@ is_video(const char * file) #ifdef TIVO_SUPPORT ends_with(file, ".TiVo") || #endif - ends_with(file, ".mov") || ends_with(file, ".3gp")); + ends_with(file, ".mov") || ends_with(file, ".3gp") || + ends_with(file, ".rm") || ends_with(file, ".rmvb") || + ends_with(file, ".webm")); } int