Fixed es_format_Clean (when called multiple times with the same es_format).

[vlc] / share / http / flash.html

diff --git a/share/http/flash.html b/share/http/flash.html
index 5bcb48abe62bec12e4c326af19dd058091e3db27..fbfbef241a8cd6627f20216cc802a3707ca8e4ee 100644 (file)
--- a/share/http/flash.html
+++ b/share/http/flash.html
@@ -23,12 +23,13 @@ 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=1,samplerate=44100}:std{access=http{mime=video/x-flv},mux=ffmpeg{mux=flv},dst=0.0.0.0:8081/stream.flv}" />\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%;'>\r
-  <object type="application/x-shockwave-flash" data="http://flowplayer.sourceforge.net/video/FlowPlayer.swf" width="100%" height="600px" id="FlowPlayer">\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
          <param name="allowScriptAccess" value="sameDomain" />\r
-         <param name="movie" value="http://flowplayer.sourceforge.net/video/FlowPlayer.swf" />\r
+         <param name="movie" value="/tmp/FlowPlayer.swf" />\r
+         <!--<param name="movie" value="http://flowplayer.sourceforge.net/video/FlowPlayer.swf" />-->\r
          <param name="quality" value="high" />\r
     <!--         <param name="scale" value="noScale" />-->\r
          <param name="wmode" value="transparent" />\r
@@ -36,10 +37,11 @@ host = document.location.toString().replace( /http:\/\//, '' ).replace( /[:/].*/
   <script type="text/javascript">\r
 // <![CDATA[\r
   document.write( '' +\r
-'        <param name="flashvars" value="config={ loop: false, initialScale: \'fit\', autoPlay: true, playList: [{ url: \'http://' + host + ':8081/stream.flv\', controlEnabled: true}] }" />' );\r
+'        <param name="flashvars" value="config={ loop: false, initialScale: \'fit\', autoPlay: false, playList: [{ url: \'http://' + host + ':8081/stream.flv\', controlEnabled: true}] }" />' );\r
 // ]]>\r
 </script>\r
   </object>\r
+  <p style="font-size: small;">Uses the <a href="http://flowplayer.sourceforge.net/">Flow Player</a> free flash video player for playback (client side).</p>\r
   </div>\r
   <vlc id="include" param1="dialogs/footer" />\r
 </body>\r