ffmpeg/mux.c: implement MUX_GET_MIME.

flash.html: we don't need to force the mime type manualy anymore (in the sout chain).

diff --git a/modules/codec/ffmpeg/mux.c b/modules/codec/ffmpeg/mux.c
index 9350d26549dc0d6cb139ab297641cbdacaf3728c..2d616846b842e1426f3a1ac836fa48ace07665fe 100644 (file)
--- a/modules/codec/ffmpeg/mux.c
+++ b/modules/codec/ffmpeg/mux.c
@@ -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;
     }

diff --git a/share/http/flash.html b/share/http/flash.html
index d33076adc046471bfa64370a471138b7d44bbcc8..fbfbef241a8cd6627f20216cc802a3707ca8e4ee 100644 (file)
--- a/share/http/flash.html
+++ b/share/http/flash.html
@@ -23,7 +23,7 @@ host = document.location.toString().replace( /http:\/\//, '' ).replace( /[:/].*/
   <vlc id="include" param1="dialogs/input" />\r
   <vlc id="include" param1="dialogs/playlist" />\r
 \r
-  <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" />\r
+  <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" />\r
 \r
   <div style='height: 100%; width: 100%; text-align: center;'>\r
   <object type="application/x-shockwave-flash" data="http://flowplayer.sourceforge.net/video/FlowPlayer.swf" width="800px" height="600px" id="FlowPlayer" style="z-index: 0">\r