Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
f1355dfc
Commit
f1355dfc
authored
Jan 11, 2012
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
doc: Replace ffmpeg references in avserver config file by avconv.
parent
1466a518
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
avserver.conf
doc/avserver.conf
+6
-6
No files found.
doc/avserver.conf
View file @
f1355dfc
...
...
@@ -31,16 +31,16 @@ NoDaemon
##################################################################
# 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
# codecs at several resolutions.
<
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:
#
#
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
# previously recorded live stream. The request should contain:
...
...
@@ -55,10 +55,10 @@ FileMaxSize 200K
# ReadOnlyFile /saved/specialvideo.ffm
# This marks the file as readonly and it will not be deleted or updated.
# Specify launch in order to start
ffmpeg
automatically.
# First
ffmpeg
must be defined with an appropriate path if needed,
# Specify launch in order to start
avconv
automatically.
# First
avconv
must be defined with an appropriate path if needed,
# after that options can follow, but avoid adding the http:// field
#Launch
ffmpeg
#Launch
avconv
# Only allow connections from localhost to the feed.
ACL
allow
127
.
0
.
0
.
1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment