Merge branch 'master' of git.parisson.com:git/telecaster-server

diff --cc src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh
index 8d7864f313d5416ad1afdf903c51fc5e2459da5d,368f8230f799848cc939801fa8b23099609bc202..898e59b5a929a9b7d3259a03444c0cab747eaa36
--- 1/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh
--- 2/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh
+++ b/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh
@@@ -2,26 -2,23 +2,27 @@@
  
  # Start TeleCaster video channel
  
 +VIDEO_ID=0
 +AUDIO_CHANNELS=2
 +
  #WIDTH=640
  #HEIGHT=360
- WIDTH=864
+ WIDTH=848
  HEIGHT=480
  #WIDTH=1280
  #HEIGHT=720
  FRAMERATE=24
  
 -v4l2-ctl -d 0 -c power_line_frequency=1
 -v4l2-ctl -d 0 -c zoom_absolute=135
 -v4l2-ctl -d 0 -c focus_auto=0
 -v4l2-ctl -d 0 -c focus_absolute=1
 -v4l2-ctl -d 0 -c sharpness=100
 +v4l2-ctl -d $VIDEO_ID -c power_line_frequency=1
 +v4l2-ctl -d $VIDEO_ID -c zoom_absolute=140
 +v4l2-ctl -d $VIDEO_ID -c focus_auto=0
 +v4l2-ctl -d $VIDEO_ID -c focus_absolute=1
 +v4l2-ctl -d $VIDEO_ID -c sharpness=100
+ 
  # ! queue ! videoflip method=rotate-180 \
  
 -gst-launch-1.0 v4l2src device=/dev/video0 ! video/x-raw, width=$WIDTH, height=$HEIGHT, framerate=$FRAMERATE/1  \
 +gst-launch-1.0 v4l2src device=/dev/video$VIDEO_ID ! video/x-raw, format=YUY2, width=$WIDTH, height=$HEIGHT, framerate=$FRAMERATE/1  \
 +      ! queue ! videoflip method=rotate-180 \
        ! queue ! videoconvert \
        ! queue ! vp8enc threads=4 deadline=2 \
        ! queue ! muxout. \