RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

doc: Replace ffmpeg references in avserver config file by avconv.

This commit is contained in:
Diego Biurrun 2012-01-11 10:50:35 +01:00
parent 1466a5181b
commit f1355dfcd6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/avserver.conf
View File

@ -31,16 +31,16 @@ NoDaemon
################################################################## ##################################################################
# Definition of the live feeds. Each live feed contains one video # Definition of the live feeds. Each live feed contains one video
# and/or audio sequence coming from an ffmpeg encoder or another # and/or audio sequence coming from an avconv encoder or another
# avserver. This sequence may be encoded simultaneously with several # avserver. This sequence may be encoded simultaneously with several
# codecs at several resolutions. # codecs at several resolutions.
<Feed feed1.ffm> <Feed feed1.ffm>
# You must use 'ffmpeg' to send a live feed to avserver. In this # You must use 'avconv' to send a live feed to avserver. In this
# example, you can type: # example, you can type:
# #
# ffmpeg http://localhost:8090/feed1.ffm # avconv http://localhost:8090/feed1.ffm
# avserver can also do time shifting. It means that it can stream any # avserver can also do time shifting. It means that it can stream any
# previously recorded live stream. The request should contain: # previously recorded live stream. The request should contain:
@ -55,10 +55,10 @@ FileMaxSize 200K
# ReadOnlyFile /saved/specialvideo.ffm # ReadOnlyFile /saved/specialvideo.ffm
# This marks the file as readonly and it will not be deleted or updated. # This marks the file as readonly and it will not be deleted or updated.
# Specify launch in order to start ffmpeg automatically. # Specify launch in order to start avconv automatically.
# First ffmpeg must be defined with an appropriate path if needed, # First avconv must be defined with an appropriate path if needed,
# after that options can follow, but avoid adding the http:// field # after that options can follow, but avoid adding the http:// field
#Launch ffmpeg #Launch avconv
# Only allow connections from localhost to the feed. # Only allow connections from localhost to the feed.
ACL allow 127.0.0.1 ACL allow 127.0.0.1