Merge branch 'small_design' of repos.ctdo.de:psychose into small_design
This commit is contained in:
commit
7bcf2b1a00
|
@ -0,0 +1,19 @@
|
|||
[Desktop Entry]
|
||||
Comment[en_US]=
|
||||
Comment=
|
||||
Exec=ffmpeg -f x11grab -s 768x576 -r 30 -i :0.0+9,89 -vcodec mjpeg -vcodec mjpeg http://localhost:8090/webcam.ffm
|
||||
GenericName[en_US]=Grabs a desktop region
|
||||
GenericName=Grabs a desktop region
|
||||
Icon=exec
|
||||
MimeType=
|
||||
Name[en_US]=4.48 Desktop Grabber
|
||||
Name=4.48 Desktop Grabber
|
||||
Path=
|
||||
StartupNotify=true
|
||||
Terminal=true
|
||||
TerminalOptions=\s--noclose
|
||||
Type=Application
|
||||
X-DBUS-ServiceName=
|
||||
X-DBUS-StartupType=none
|
||||
X-KDE-SubstituteUID=false
|
||||
X-KDE-Username=
|
|
@ -0,0 +1,19 @@
|
|||
[Desktop Entry]
|
||||
Comment[en_US]=
|
||||
Comment=
|
||||
Exec=ffserver -d -f /etc/ffserver.conf -v debug\n
|
||||
GenericName[en_US]=Streams desktop casts
|
||||
GenericName=Streams desktop casts
|
||||
Icon=exec
|
||||
MimeType=
|
||||
Name[en_US]=4.48 Streamer
|
||||
Name=4.48 Streamer
|
||||
Path=
|
||||
StartupNotify=true
|
||||
Terminal=true
|
||||
TerminalOptions=\s--noclose
|
||||
Type=Application
|
||||
X-DBUS-ServiceName=
|
||||
X-DBUS-StartupType=
|
||||
X-KDE-SubstituteUID=false
|
||||
X-KDE-Username=
|
|
@ -0,0 +1,19 @@
|
|||
Port 8090
|
||||
BindAddress 0.0.0.0
|
||||
MaxClients 10
|
||||
MaxBandwidth 1000000
|
||||
CustomLog -
|
||||
|
||||
<Feed webcam.ffm>
|
||||
file /tmp/webcam.ffm
|
||||
FileMaxSize 10M
|
||||
ACL allow 127.0.0.1
|
||||
</Feed>
|
||||
|
||||
<Stream webcam.mjpeg>
|
||||
Feed webcam.ffm
|
||||
Format mjpeg
|
||||
VideoFrameRate 25
|
||||
VideoSize 768x576
|
||||
Noaudio
|
||||
</Stream>
|
Loading…
Reference in New Issue