aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.c
Commit message (Collapse)AuthorAgeFilesLines
...
* license/copyright change - fixed header messFabrice Bellard2002-05-251-31/+27
| | | | Originally committed as revision 588 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Added yet more output to the status page to try and track down a problemPhilip Gladstone2002-05-241-3/+8
| | | | Originally committed as revision 579 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Add support for time-limiting a live stream. (Some guy streamed one ofPhilip Gladstone2002-05-241-9/+27
| | | | | | | | my pondcam streams for 24 hours! I'll bet he wasn't watching. * Add code to allocate the priv_data so that the ffm header can be parsed again. [Fix crash] Originally committed as revision 577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use new api (NOT TESTED) - suppressed strlcpyFabrice Bellard2002-05-201-19/+26
| | | | Originally committed as revision 549 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix a segfault when handling errors or .asx or .ram files. Silly bugPhilip Gladstone2002-05-201-2/+4
| | | | | | on my part. Originally committed as revision 536 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use av memory functionsFabrice Bellard2002-05-181-7/+7
| | | | Originally committed as revision 531 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * If a stream gets stuck in WAIT_FEED, then disconnecting the other endPhilip Gladstone2002-05-181-78/+123
| | | | | | | | | | | | will clear out the stream. I think that this is really a linux bug in the handling of poll, but I did a workaround anyway. * Improve the statistics output and prevent a buffer overrun when lots of clients are connected. * Process ffm input when it is received and don't always be one ffm packet behind. * Try to avoid going through the poll loop when not required. Originally committed as revision 514 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Change the default behaviour to start streaming as soon as possible (i.e.Philip Gladstone2002-05-171-7/+28
| | | | | | | | | no waiting for key frames). * Provide StartSendOnKey paramter for a stream to wait until we get key frames before sending. * Add the codec names into the status page. May help debugging problems. Originally committed as revision 507 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Add code to configure the following:Philip Gladstone2002-05-161-27/+172
| | | | | | | | | | | | | | | | * prebuffering/preroll a live stream -- this improves startup time * videoqmin/videoqmax/videoqdiff -- codec parameters * maximum bandwidth for live streams * Add support for .ram and .rpm extensions mapping onto .rm * Make the status page show bandwidth. Also make the .asf and .rm links go to .asx and .ram files. * Make a stream only start streaming when it gets a keyframe on each stream. This is arguable, and it maybe ought to be restricted to live streams. However, since I don't think that file streams work, this is a step in the right direction. It improves the startup delay. * Log an error if we are unable to delete the temp feed file. Originally committed as revision 501 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Improve logging -- now actually gives you the number of bytes sentPhilip Gladstone2002-05-101-20/+134
| | | | | | | | | | | * Print out the logging information that comes from WMP (you'd be suprised what it sends! * Fix a remotely exploitable buffer overflow (argh!) * Add support for automatically serving up .asx files. It generates an automatic redirect to the associated .asf file (with the same parameters). I guess that someone who understands the realaudio equivalent could hack that it as well. Originally committed as revision 482 to svn://svn.ffmpeg.org/ffmpeg/trunk
* - HQ option for ffserver. Thanks to D Richard Felker III.Juanjo2002-05-091-0/+4
| | | | Originally committed as revision 478 to svn://svn.ffmpeg.org/ffmpeg/trunk
* - Changed default qmin = 3 as ffmpeg.cJuanjo2002-05-091-6/+7
| | | | | | - Less bitrate tolerance since we are streaming. Originally committed as revision 474 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Fix a nasty problem with output buffering not have enough (or large enough)Philip Gladstone2002-05-091-22/+136
| | | | | | | | | | | | | | | | | buffers. In fact, the code was pretty much shot. * Try to fool WMP into thinking that we are a microsoft server. * When we establish a stream to a user, copy the codec information from that saved as part of the stream. This gives us the real frame_size and other important parameters. * ASF needs to know about key frames, so add some logic to copy this information around. * When we get the data from ffmpeg as part of a feed, make sure that we save the actual codec parameters. * Allow configuration of AudioCodec and VideoCodec * Make sure that we delete the feed file before starting. This is not ideal but it makes things work a whole lot better! Originally committed as revision 454 to svn://svn.ffmpeg.org/ffmpeg/trunk
* - Added force_pts to av_write_packet() to be able to force PTS, this helpsJuanjo2002-04-071-1/+1
| | | | | | | | | | (and fix) stream copying. By now force_pts it's just honoured by the MPEG muxer. ASF could honour this also, but it should be fixed to use Tickers first. - MPEG audio decoder exports it's frame size in bytes. - Hope this fix the floating point exception found in ffserver. Originally committed as revision 382 to svn://svn.ffmpeg.org/ffmpeg/trunk
* trying to fix qscale==0Michael Niedermayer2002-03-191-0/+7
| | | | Originally committed as revision 341 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fixing warningMichael Niedermayer2002-02-261-0/+1
| | | | Originally committed as revision 315 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Also include time.h for nanosleep()Zdenek Kabelac2002-02-181-2/+3
| | | | | | by: Philipp Matthias Hahn <pmhahn@titan.lahn.de> Originally committed as revision 309 to svn://svn.ffmpeg.org/ffmpeg/trunk
* optimized the normal bitstream writer, its faster than the alternative one ↵Michael Niedermayer2002-02-151-0/+1
| | | | | | on p3 now ... lets hope its at least not slower on p4 & k7 Originally committed as revision 299 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fixed prototype changeFabrice Bellard2001-09-251-1/+1
| | | | Originally committed as revision 150 to svn://svn.ffmpeg.org/ffmpeg/trunk
* jpeg hackFabrice Bellard2001-08-151-0/+3
| | | | Originally committed as revision 89 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mergeFabrice Bellard2001-07-221-0/+1577
| | | | Originally committed as revision 6 to svn://svn.ffmpeg.org/ffmpeg/trunk
* removing old filesFabrice Bellard2001-07-191-1642/+0
| | | | Originally committed as revision 4 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Initial revisionFabrice Bellard2000-12-201-0/+1642
Originally committed as revision 2 to svn://svn.ffmpeg.org/ffmpeg/trunk