Commit 25d99492 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

input: use video/MP2P MIME type for MPEG-PS (fixes #15203)

video/mpeg is underspecified, could be ES, PS or TS.
video/MP1S, video/MP2P and video/MP2T are more specific/better
specified (but should only be used internally or in SDPs).
parent 6a89ab3b
...@@ -1928,7 +1928,7 @@ static int AccessControl( access_t *p_access, int i_query, va_list args ) ...@@ -1928,7 +1928,7 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
if( p_stream->i_fourcc == VLC_CODEC_DV ) if( p_stream->i_fourcc == VLC_CODEC_DV )
*type = strdup( "video/dv" ); *type = strdup( "video/dv" );
else if( p_stream->i_fourcc == VLC_CODEC_MPGV ) else if( p_stream->i_fourcc == VLC_CODEC_MPGV )
*type = strdup( "video/mpeg" ); *type = strdup( "video/MP2P" );
else else
return VLC_EGENERIC; return VLC_EGENERIC;
break; break;
......
...@@ -275,7 +275,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) ...@@ -275,7 +275,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
break; break;
case ACCESS_GET_CONTENT_TYPE: case ACCESS_GET_CONTENT_TYPE:
*va_arg( args, char ** ) = strdup("video/mpeg"); *va_arg( args, char ** ) = strdup("video/MP2P");
break; break;
case ACCESS_SET_TITLE: case ACCESS_SET_TITLE:
......
...@@ -1082,7 +1082,7 @@ static int VCDControl( access_t *p_access, int i_query, va_list args ) ...@@ -1082,7 +1082,7 @@ static int VCDControl( access_t *p_access, int i_query, va_list args )
break; break;
case ACCESS_GET_CONTENT_TYPE: case ACCESS_GET_CONTENT_TYPE:
*va_arg( args, char ** ) = strdup( "video/mpeg" ); *va_arg( args, char ** ) = strdup( "video/MP2P" );
break; break;
case ACCESS_SET_TITLE: case ACCESS_SET_TITLE:
......
...@@ -308,7 +308,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) ...@@ -308,7 +308,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
case ACCESS_GET_CONTENT_TYPE: case ACCESS_GET_CONTENT_TYPE:
*va_arg( args, char ** ) = *va_arg( args, char ** ) =
strdup( p_sys->b_ts_format ? "video/MP2T" : "video/mpeg" ); strdup( p_sys->b_ts_format ? "video/MP2T" : "video/MP2P" );
break; break;
case ACCESS_SET_TITLE: case ACCESS_SET_TITLE:
......
...@@ -59,9 +59,10 @@ static const char *demux_FromContentType(const char *mime) ...@@ -59,9 +59,10 @@ static const char *demux_FromContentType(const char *mime)
{ "audio/aacp", "m4a" }, { "audio/aacp", "m4a" },
{ "audio/mpeg", "mp3" }, { "audio/mpeg", "mp3" },
{ "application/rss+xml", "podcast" }, { "application/rss+xml", "podcast" },
//{ "video/MP1S", "es,mpgv" }, !b_force
{ "video/MP2P", "ps" },
{ "video/MP2T", "ts" }, { "video/MP2T", "ts" },
{ "video/dv", "rawdv" }, { "video/dv", "rawdv" },
{ "video/mpeg", "ps" },
{ "video/nsa", "nsv" }, { "video/nsa", "nsv" },
{ "video/nsv", "nsv" }, { "video/nsv", "nsv" },
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment