- change line endings of file by running dos2unix

This commit is contained in:
Richard Alam 2017-03-06 15:43:41 +00:00
parent b8c2548ed9
commit d83fc6466a

View File

@ -1,30 +1,30 @@
#
# NOTE: default properties.
#
# NOTE!!!! NOTE!!!! NOTE!!!! NOTE!!!! NOTE!!!!
# When making changes that you don't want checked-in, do
# git update-index --assume-unchanged <file>
#
# To have git track the changes again
# git update-index --no-assume-unchanged <file>
#
recordingDirectory=/usr/share/red5/webapps/screenshare/streams
redis.host=127.0.0.1
redis.port=6379
streamBaseUrl=rtmp://192.168.23.53/screenshare
jnlpUrl=http://192.168.23.53/screenshare
jnlpFile=http://192.168.23.53/screenshare/screenshare.jnlp
useH264=false
# NOTES:
# 1. GOP (group of pictures) is calculated as frameRate * keyFrameInterval
# 2. intra-refresh=1 doesn't work in Chrome. Late comers can't view the stream as
# the user missed the key frame
# 3. keyFrameInterval is in seconds
# 4. Make sure you encode & into &amp; as it will break the JNLP XML
#codecOptions=crf=36&amp;preset=veryfast&amp;tune=animation,zerolatency&amp;frameRate=12.0&amp;keyFrameInterval=6
codecOptions=crf=38&amp;preset=veryfast&amp;tune=zerolatency&amp;frameRate=5.0&amp;keyFrameInterval=5
#
# NOTE: default properties.
#
# NOTE!!!! NOTE!!!! NOTE!!!! NOTE!!!! NOTE!!!!
# When making changes that you don't want checked-in, do
# git update-index --assume-unchanged <file>
#
# To have git track the changes again
# git update-index --no-assume-unchanged <file>
#
recordingDirectory=/usr/share/red5/webapps/screenshare/streams
redis.host=127.0.0.1
redis.port=6379
streamBaseUrl=rtmp://192.168.23.22/screenshare
jnlpUrl=http://192.168.23.22/screenshare
jnlpFile=http://192.168.23.22/screenshare/screenshare.jnlp
useH264=false
# NOTES:
# 1. GOP (group of pictures) is calculated as frameRate * keyFrameInterval
# 2. intra-refresh=1 doesn't work in Chrome. Late comers can't view the stream as
# the user missed the key frame
# 3. keyFrameInterval is in seconds
# 4. Make sure you encode & into &amp; as it will break the JNLP XML
#codecOptions=crf=36&amp;preset=veryfast&amp;tune=animation,zerolatency&amp;frameRate=12.0&amp;keyFrameInterval=6
codecOptions=crf=38&amp;preset=veryfast&amp;tune=zerolatency&amp;frameRate=5.0&amp;keyFrameInterval=5