Commit c089aa89 authored by Antoine Cellerier's avatar Antoine Cellerier

ffmpeg/mux.c: implement MUX_GET_MIME.

flash.html: we don't need to force the mime type manualy anymore (in the sout chain).
parent 8bc3f3ea
......@@ -428,6 +428,12 @@ static int Control( sout_mux_t *p_mux, int i_query, va_list args )
return VLC_SUCCESS;
case MUX_GET_MIME:
{
char **ppsz = (char**)va_arg( args, char ** );
*ppsz = strdup( p_mux->p_sys->oc->oformat->mime_type );
return VLC_SUCCESS;
}
default:
return VLC_EGENERIC;
}
......
......@@ -23,7 +23,7 @@ host = document.location.toString().replace( /http:\/\//, '' ).replace( /[:/].*/
<vlc id="include" param1="dialogs/input" />
<vlc id="include" param1="dialogs/playlist" />
<input id="sout_mrl" type="hidden" value=":sout=#transcode{vcodec=FLV1,acodec=mp3,channels=2,samplerate=44100}:std{access=http{mime=video/x-flv},mux=ffmpeg{mux=flv},dst=0.0.0.0:8081/stream.flv} :no-sout-keep" />
<input id="sout_mrl" type="hidden" value=":sout=#transcode{vcodec=FLV1,acodec=mp3,channels=2,samplerate=44100}:std{access=http,mux=ffmpeg{mux=flv},dst=0.0.0.0:8081/stream.flv} :no-sout-keep" />
<div style='height: 100%; width: 100%; text-align: center;'>
<object type="application/x-shockwave-flash" data="http://flowplayer.sourceforge.net/video/FlowPlayer.swf" width="800px" height="600px" id="FlowPlayer" style="z-index: 0">
......
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