Unified · Split
| @@ -31,16 +31,16 @@ NoDaemon · 30 unmodified lines | |||
| 31 | 31 | ||
| 32 | ################################################################## | 32 | ################################################################## |
| 33 | # Definition of the live feeds. Each live feed contains one video | 33 | # Definition of the live feeds. Each live feed contains one video |
| 34 | # and/or audio sequence coming from an ffmpeg encoder or another | 34 | # and/or audio sequence coming from an avconv encoder or another |
| 35 | # avserver. This sequence may be encoded simultaneously with several | 35 | # avserver. This sequence may be encoded simultaneously with several |
| 36 | # codecs at several resolutions. | 36 | # codecs at several resolutions. |
| 37 | 37 | ||
| 38 | <Feed feed1.ffm> | 38 | <Feed feed1.ffm> |
| 39 | 39 | ||
| 40 | # You must use 'ffmpeg' to send a live feed to avserver. In this | 40 | # You must use 'avconv' to send a live feed to avserver. In this |
| 41 | # example, you can type: | 41 | # example, you can type: |
| 42 | # | 42 | # |
| 43 | # ffmpeg http://localhost:8090/feed1.ffm | 43 | # avconv http://localhost:8090/feed1.ffm |
| 44 | 44 | ||
| 45 | # avserver can also do time shifting. It means that it can stream any | 45 | # avserver can also do time shifting. It means that it can stream any |
| 46 | # previously recorded live stream. The request should contain: | 46 | # previously recorded live stream. The request should contain: |
| @@ -55,10 +55,10 @@ FileMaxSize 200K · 8 unmodified lines | |||
| 55 | # ReadOnlyFile /saved/specialvideo.ffm | 55 | # ReadOnlyFile /saved/specialvideo.ffm |
| 56 | # This marks the file as readonly and it will not be deleted or updated. | 56 | # This marks the file as readonly and it will not be deleted or updated. |
| 57 | 57 | ||
| 58 | # Specify launch in order to start ffmpeg automatically. | 58 | # Specify launch in order to start avconv automatically. |
| 59 | # First ffmpeg must be defined with an appropriate path if needed, | 59 | # First avconv must be defined with an appropriate path if needed, |
| 60 | # after that options can follow, but avoid adding the http:// field | 60 | # after that options can follow, but avoid adding the http:// field |
| 61 | #Launch ffmpeg | 61 | #Launch avconv |
| 62 | 62 | ||
| 63 | # Only allow connections from localhost to the feed. | 63 | # Only allow connections from localhost to the feed. |
| 64 | ACL allow 127.0.0.1 | 64 | ACL allow 127.0.0.1 |