summaryrefslogtreecommitdiffstats
path: root/doc/ffserver.conf
Commit message (Collapse)AuthorAgeFilesLines
* doc/ffserver: Add entry for missing jpeg variantMichael Niedermayer2015-06-081-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffserver: deprecate Port and BindAddress options in favor of HTTPPort and ↵Stefano Sabatini2014-08-171-2/+2
| | | | | | | | HTTPBindAddress The new option names are more explicit. Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* ffserver: add stream Metadata optionStefano Sabatini2013-12-161-5/+5
| | | | | Also deprecate Author, Comment, Copyright, and Title options, and update docs to use the new Metadata option.
* Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'Michael Niedermayer2012-11-161-4/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd': APIChanges: add entry for av_read_packet deprecation mxfdec: fix typo in mxf_read_seek() avserver: use freopen to redirect stdin/out/err to /dev/null avserver: remove daemon mode configure: Check for -Werror parameters on clang doxygen: remove obsolete options from Doxyfile configure: Add option to disable all command line programs Conflicts: Changelog configure doc/APIchanges doc/ffserver.conf doc/ffserver.texi ffserver.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* \ Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-101-2/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (26 commits) eac3dec: replace undefined 1<<31 with INT32_MIN in noise generation yadif: specify array size outside DECLARE_ALIGNED prores: specify array size outside DECLARE_ALIGNED brackets. WavPack demuxer: set packet duration tta: use skip_bits_long() mxfdec: Ignore the last entry in Avid's index table segments mxfdec: Sanity-check SampleRate mxfdec: Handle small EditUnitByteCount mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1a mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index() mxfdec: Sanity check PreviousPartition mxfdec: Never seek back in local sets and KLVs mxfdec: Move the current_partition check inside mxf_read_header() mxfdec: Fix infinite loop in mxf_packet_timestamps() mxfdec: Check eof_reached in mxf_read_local_tags() mxfdec: Check for NULL component mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps() mxfdec: Make sure x < index_table->nb_ptses build: Add missing directories to DIRS declarations. ... Conflicts: doc/build_system.txt doc/fate.texi libavfilter/x86/yadif_template.c libavformat/mxfdec.c libavutil/Makefile tests/fate/audio.mak tests/fate/prores.mak tests/fate/screen.mak tests/fate/video.mak tests/ref/fate/bethsoft-vid tests/ref/fate/cscd tests/ref/fate/dfa4 tests/ref/fate/nuv tests/ref/fate/vp8-sign-bias tests/ref/fate/wmv8-drm tests/ref/lavf/gxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Rename ffserver to avserver.Anton Khirnov2011-08-091-377/+0
| |
| * Update the url to the site website and change ffmpeg-devel to libav-develJohan Andersson2011-03-131-1/+1
|/ | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Support presets in ffserver.confHoward Chu2010-06-081-0/+21
| | | | Originally committed as revision 23524 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make the maximum number of simultaneous HTTP connections handled byStefano Sabatini2008-09-031-0/+5
| | | | | | | ffserver a configuration parameter. The name of the new parameter introduced is MaxHTTPConnections. Originally committed as revision 15182 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove reference to the unsupported master format from ffserver.conf.Stefano Sabatini2008-08-091-1/+0
| | | | Originally committed as revision 14675 to svn://svn.ffmpeg.org/ffmpeg/trunk
* more format abbreviationsBenoit Fouet2007-04-241-1/+4
| | | | Originally committed as revision 8798 to svn://svn.ffmpeg.org/ffmpeg/trunk
* COSMETICS: Remove all trailing whitespace.Diego Biurrun2005-12-171-7/+7
| | | | Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
* support for unlimited feed sizeAlex Beregszaszi2005-11-131-1/+1
| | | | Originally committed as revision 4697 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make Launch more appropriate with support for full paths for the ffmpeg binaryAlex Beregszaszi2005-11-131-1/+3
| | | | Originally committed as revision 4693 to svn://svn.ffmpeg.org/ffmpeg/trunk
* strict -1 is mandatory for jpegs because the colorspace thingie, this should ↵Alex Beregszaszi2005-11-131-0/+2
| | | | | | be handled in a better way though Originally committed as revision 4691 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Talk of MPEG-4 instead of DivX.Diego Biurrun2005-06-111-1/+1
| | | | Originally committed as revision 4373 to svn://svn.ffmpeg.org/ffmpeg/trunk
* consistent spellingDiego Biurrun2005-06-101-1/+1
| | | | Originally committed as revision 4372 to svn://svn.ffmpeg.org/ffmpeg/trunk
* spelling fixes suggested by the WandererDiego Biurrun2005-06-091-8/+8
| | | | Originally committed as revision 4369 to svn://svn.ffmpeg.org/ffmpeg/trunk
* spelling/grammar/wordingDiego Biurrun2005-06-091-23/+23
| | | | Originally committed as revision 4364 to svn://svn.ffmpeg.org/ffmpeg/trunk
* changed the mailinglist pointers to the new place (mplayerhq)Alex Beregszaszi2005-04-111-1/+1
| | | | Originally committed as revision 4122 to svn://svn.ffmpeg.org/ffmpeg/trunk
* vbv size for ffserver.conf patch by (Panagiotis Issaris <takis [] ↵Panagiotis Issaris2004-12-291-0/+4
| | | | | | lumumba*luc*ac*be>) Originally committed as revision 3780 to svn://svn.ffmpeg.org/ffmpeg/trunk
* incorrect commentFabrice Bellard2003-07-221-2/+1
| | | | Originally committed as revision 2068 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mention the two asf formatsFabrice Bellard2003-07-221-1/+2
| | | | Originally committed as revision 2067 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Have the test.asf stream enabled by default (thanks to htz@kde.org)Philip Gladstone2003-06-101-10/+10
| | | | Originally committed as revision 1943 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Add Video4MotionVector in a stream description to behave like the -4mv flagPhilip Gladstone2003-04-091-0/+8
| | | | | | | * Add ReadOnlyFile which behaves like File, but does not permit changing of the file. This can be used to prevent deleting of saved ffm files. Originally committed as revision 1743 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Applied Mark Hill's patches.Philip Gladstone2002-12-211-171/+115
| | | | Originally committed as revision 1356 to svn://svn.ffmpeg.org/ffmpeg/trunk
* added example to hack with SDP/multicast streamingFabrice Bellard2002-11-201-1/+27
| | | | Originally committed as revision 1261 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add some examples of using ACLPhilip Gladstone2002-07-271-0/+21
| | | | Originally committed as revision 822 to svn://svn.ffmpeg.org/ffmpeg/trunk
* added 'NoDaemon' command - added RTP/RTSP stream exampleFabrice Bellard2002-07-251-0/+21
| | | | Originally committed as revision 813 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add the copyright/comment/author/title keywordsPhilip Gladstone2002-06-051-0/+4
| | | | Originally committed as revision 665 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Added Launch, FaviconURL and Redirect examplesPhilip Gladstone2002-05-301-2/+41
| | | | Originally committed as revision 631 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Added use of StartSendOnKeyPhilip Gladstone2002-05-171-0/+1
| | | | Originally committed as revision 508 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Updated with new stream configuration itemsPhilip Gladstone2002-05-161-0/+13
| | | | Originally committed as revision 502 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Updated so that some streams actually work!Philip Gladstone2002-05-091-76/+79
| | | | Originally committed as revision 456 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mergeFabrice Bellard2001-07-221-0/+261
| | | | Originally committed as revision 6 to svn://svn.ffmpeg.org/ffmpeg/trunk
* removing old filesFabrice Bellard2001-07-191-214/+0
| | | | Originally committed as revision 4 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Initial revisionFabrice Bellard2000-12-201-0/+214
Originally committed as revision 2 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud