Statistics
| Branch: | Revision:

ffmpeg / ffserver.c @ 2d563d2f

History | View | Annotate | Download (152 KB)

# Date Author Comment
2d563d2f 08/08/2007 07:23 PM Alex Beregszaszi

cosmetic: simplify some constructs

Originally committed as revision 9989 to svn://svn.ffmpeg.org/ffmpeg/trunk

0bd53967 08/08/2007 07:04 PM Alex Beregszaszi

cosmetic: extra space

Originally committed as revision 9987 to svn://svn.ffmpeg.org/ffmpeg/trunk

33a4ecbe 08/08/2007 06:56 PM Alex Beregszaszi

cosmetic: indentation

Originally committed as revision 9986 to svn://svn.ffmpeg.org/ffmpeg/trunk

eeffbdea 08/08/2007 06:55 PM Alex Beregszaszi

cosmetic: remove extra parenthesis

Originally committed as revision 9985 to svn://svn.ffmpeg.org/ffmpeg/trunk

af0f3712 07/13/2007 12:55 AM Alex Beregszaszi

10l to Benoit, poll.h is already included below, and this broke compilation on mingw

Originally committed as revision 9620 to svn://svn.ffmpeg.org/ffmpeg/trunk

e5a389a1 07/05/2007 10:40 AM Diego Biurrun

license header consistency cosmetics

Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk

0f4e8165 07/02/2007 07:43 AM Ronald S. Bultje

to be able to compile without HAVE_AV_CONFIG_H
patch by Ronald S. Bultje: [rsbultje gmail com]
original thread: [FFmpeg-devel] ffmpeg.c/cmdutils.c compilation
date: 06/23/2007 03:15 AM

Originally committed as revision 9453 to svn://svn.ffmpeg.org/ffmpeg/trunk

f7d78f36 06/24/2007 11:27 AM Måns Rullgård

replace the uses of old string functions that Reimar missed

Originally committed as revision 9406 to svn://svn.ffmpeg.org/ffmpeg/trunk

b33ece16 06/18/2007 08:08 AM Stefano Sabatini

replace calls to deprecated parsing functions to calls to new ones
patch by Stefano Sabatini: [stefano sabatini-lala poste it]

Originally committed as revision 9359 to svn://svn.ffmpeg.org/ffmpeg/trunk

755bfeab 06/12/2007 09:29 AM Diego Biurrun

misc spelling fixes

Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk

364a9607 06/10/2007 02:34 PM Diego Biurrun

Move HAVE_AV_CONFIG_H definition to the Makefile like in the rest of FFmpeg.

Originally committed as revision 9273 to svn://svn.ffmpeg.org/ffmpeg/trunk

ba472aaf 04/27/2007 12:41 AM Alex Beregszaszi

implement ff_socket_nonblock and use it in networking code

Originally committed as revision 8846 to svn://svn.ffmpeg.org/ffmpeg/trunk

8da4034f 04/27/2007 12:35 AM Alex Beregszaszi

use ff_neterrno() and FF_NETERROR() for networking error handling

Originally committed as revision 8845 to svn://svn.ffmpeg.org/ffmpeg/trunk

0bdacf29 04/27/2007 12:17 AM Alex Beregszaszi

use network.h instead network includes

Originally committed as revision 8844 to svn://svn.ffmpeg.org/ffmpeg/trunk

4ee10633 04/26/2007 07:27 PM Diego Biurrun

cosmetics: Remove trailing whitespace and tabs.

Originally committed as revision 8838 to svn://svn.ffmpeg.org/ffmpeg/trunk

2bd8416e 04/25/2007 10:23 PM Alex Beregszaszi

use resolve_host in acl handlign too, simplificates the code

Originally committed as revision 8819 to svn://svn.ffmpeg.org/ffmpeg/trunk

18405874 04/25/2007 10:22 PM Alex Beregszaszi

make the last globals static

Originally committed as revision 8818 to svn://svn.ffmpeg.org/ffmpeg/trunk

ad8b8abc 04/25/2007 09:05 PM Alex Beregszaszi

support for hostnames instead ip addresses in ffserver conf (using resolve_host now)

Originally committed as revision 8815 to svn://svn.ffmpeg.org/ffmpeg/trunk

57dbe08b 04/24/2007 01:28 PM Luca Abeni

Fix ffserver crash when closing the second RTP session

Originally committed as revision 8799 to svn://svn.ffmpeg.org/ffmpeg/trunk

aabce533 04/22/2007 06:06 PM Alex Beregszaszi

check ip port range from config

Originally committed as revision 8787 to svn://svn.ffmpeg.org/ffmpeg/trunk

5eb782f0 04/22/2007 06:01 PM Alex Beregszaszi

simplificate

Originally committed as revision 8786 to svn://svn.ffmpeg.org/ffmpeg/trunk

cb2abe3f 04/22/2007 05:56 PM Alex Beregszaszi

use av_strdup instead malloc/strcpy

Originally committed as revision 8785 to svn://svn.ffmpeg.org/ffmpeg/trunk

d2040a8f 04/22/2007 05:48 PM Alex Beregszaszi

fixed InputFormat option, which was never working

Originally committed as revision 8784 to svn://svn.ffmpeg.org/ffmpeg/trunk

0aecfdf9 04/22/2007 03:06 PM Alex Beregszaszi

remove useless code, file removal is handled elsewhere

Originally committed as revision 8782 to svn://svn.ffmpeg.org/ffmpeg/trunk

b0b2faa7 04/19/2007 01:55 PM Luca Abeni

Fix an use-after-free bug

Originally committed as revision 8759 to svn://svn.ffmpeg.org/ffmpeg/trunk

2c6a5e6c 04/19/2007 01:54 PM Luca Abeni

Remove unused callbacks from ffserver

Originally committed as revision 8758 to svn://svn.ffmpeg.org/ffmpeg/trunk

e8d658df 04/10/2007 02:40 PM Luca Abeni

Fix the poll() loop (ret == 0 means that a timeout expired, so it must be
handled)

Originally committed as revision 8711 to svn://svn.ffmpeg.org/ffmpeg/trunk

7e665cd3 04/10/2007 02:36 PM Luca Abeni

Fix the generation of RTSP reply headers (the "DEF" macro is not used
anymore in rtspcodes.h)

Originally committed as revision 8710 to svn://svn.ffmpeg.org/ffmpeg/trunk

6308caca 03/31/2007 04:36 PM Stanislav Brabec

Fix warning:
ffserver.c:4303: warning: 'acl.next' is used uninitialized in this function
patch by Stanislav Brabec, sbrabec suse cz

Originally committed as revision 8573 to svn://svn.ffmpeg.org/ffmpeg/trunk

087fa475 03/31/2007 02:39 PM Alex Beregszaszi

fix x-octet-stream mime type

Originally committed as revision 8568 to svn://svn.ffmpeg.org/ffmpeg/trunk

65e72261 03/31/2007 02:36 PM Alex Beregszaszi

use av_strdup

Originally committed as revision 8567 to svn://svn.ffmpeg.org/ffmpeg/trunk

55d07ba6 03/31/2007 02:34 PM Alex Beregszaszi

remove dead code

Originally committed as revision 8566 to svn://svn.ffmpeg.org/ffmpeg/trunk

c367d067 03/27/2007 09:47 PM Michael Niedermayer

prevent exit missuse

Originally committed as revision 8536 to svn://svn.ffmpeg.org/ffmpeg/trunk

750f0e1f 03/12/2007 02:17 PM Panagiotis Issaris

Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
which use av_log() for logging instead of fprintf().

Originally committed as revision 8339 to svn://svn.ffmpeg.org/ffmpeg/trunk

acdc8520 03/09/2007 11:20 AM Alex Beregszaszi

print codec parameters for audio too

Originally committed as revision 8303 to svn://svn.ffmpeg.org/ffmpeg/trunk

d0a5513b 03/06/2007 01:29 PM Alex Beregszaszi

disconnect new feeder if feed is already being received

Originally committed as revision 8271 to svn://svn.ffmpeg.org/ffmpeg/trunk

bae79c04 02/24/2007 03:17 AM Alex Beregszaszi

redirect http get requests of / to index.html (note, the http_parse_request may worth a rewrite)

Originally committed as revision 8113 to svn://svn.ffmpeg.org/ffmpeg/trunk

c3f58185 02/24/2007 02:39 AM Alex Beregszaszi

store internal timestamps in int64_t instead long

Originally committed as revision 8112 to svn://svn.ffmpeg.org/ffmpeg/trunk

f1debfd0 02/24/2007 02:28 AM Alex Beregszaszi

rescale pts/dts for output format

Originally committed as revision 8111 to svn://svn.ffmpeg.org/ffmpeg/trunk

f75cdda7 02/24/2007 02:24 AM Alex Beregszaszi

return error if av_write_header failed (it fails on some containers when codec is not supported)

Originally committed as revision 8110 to svn://svn.ffmpeg.org/ffmpeg/trunk

638831aa 02/24/2007 02:16 AM Alex Beregszaszi

disconnect client if trailer is sent

Originally committed as revision 8109 to svn://svn.ffmpeg.org/ffmpeg/trunk

5400e092 02/22/2007 01:27 PM Alex Beregszaszi

if feeder is disconnected, clear the feed registration, thus a new feeder can connect

Originally committed as revision 8072 to svn://svn.ffmpeg.org/ffmpeg/trunk

038a1243 02/22/2007 01:23 PM Alex Beregszaszi

codec_tag settable via VideoTag, and transmit codec_tag in ffm

Originally committed as revision 8071 to svn://svn.ffmpeg.org/ffmpeg/trunk

c60202df 02/22/2007 12:38 PM Alex Beregszaszi

change write/read to send/recv on socket operations

Originally committed as revision 8069 to svn://svn.ffmpeg.org/ffmpeg/trunk

d96633bb 02/22/2007 12:17 PM Alex Beregszaszi

change close() to closesocket() on sockets (compatible with libavformat)

Originally committed as revision 8068 to svn://svn.ffmpeg.org/ffmpeg/trunk

8cba6ba9 02/21/2007 02:06 PM Alex Beregszaszi

remove gettime_ms and use av_gettime instead of it

Originally committed as revision 8052 to svn://svn.ffmpeg.org/ffmpeg/trunk

1df93ae9 02/21/2007 01:50 PM Alex Beregszaszi

use av_random instead random/srandom

Originally committed as revision 8051 to svn://svn.ffmpeg.org/ffmpeg/trunk

b0c858d8 02/15/2007 07:44 AM François Revol

poll() emulation for BeOS, and maybe MinGW.

Originally committed as revision 7987 to svn://svn.ffmpeg.org/ffmpeg/trunk

18b67ae5 11/14/2006 11:53 PM Måns Rullgård

rename HAVE_DLFCN to HAVE_DLFCN_H

Originally committed as revision 7078 to svn://svn.ffmpeg.org/ffmpeg/trunk

78e61cc5 11/13/2006 11:14 PM Måns Rullgård

rename CONFIG_HAVE_DLFCN and CONFIG_HAVE_DLOPEN to HAVE_DLFCN/HAVE_DLOPEN

Originally committed as revision 7018 to svn://svn.ffmpeg.org/ffmpeg/trunk

949b1a13 11/01/2006 10:39 PM Steve L'Homme

Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk

b78e7197 10/07/2006 03:30 PM Diego Biurrun

Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk

3e66a740 10/01/2006 05:26 PM Diego Biurrun

Update copyright year and mention other copyright holders.

Originally committed as revision 6408 to svn://svn.ffmpeg.org/ffmpeg/trunk

d2a067d1 07/09/2006 11:40 PM Måns Rullgård

give AVInput/OutputFormat structs consistent names

Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk

f1cc88a5 06/20/2006 10:24 AM Diego Biurrun

Use Subversion revision for FFMPEG_VERSION.
based on a patch by Ismail Dönmez ismail$$at$$pardus$$dot$$org$$dot$$tr

Originally committed as revision 5502 to svn://svn.ffmpeg.org/ffmpeg/trunk

7b49ce2e 06/18/2006 11:33 AM Stefan Huehner

Add const to (mostly) char* and make some functions static, which aren't used
outside their declaring source file and which have no corresponding prototype.
patch by Stefan Huehner stefan^^@^^huehner^^.^^org

Originally committed as revision 5497 to svn://svn.ffmpeg.org/ffmpeg/trunk

267b0e57 03/09/2006 12:36 AM Aurelien Jacobs

Update ffserver regression tests:
- really produce readable files (instead of 0 byte files or headers only)
- use bitexact, fastint dct, simple idct and qscale
- gives consistent results across several archs
- still fails on altivec ppc

Originally committed as revision 5129 to svn://svn.ffmpeg.org/ffmpeg/trunk

33f5e2ec 02/21/2006 09:15 PM Alex Beregszaszi

make those nasty variables static, also fix a html bug

Originally committed as revision 5044 to svn://svn.ffmpeg.org/ffmpeg/trunk

b2b77b9c 02/02/2006 08:11 PM Måns Rullgård

remove unused function get_longterm_datarate()

Originally committed as revision 4928 to svn://svn.ffmpeg.org/ffmpeg/trunk

5509bffa 01/12/2006 10:43 PM Diego Biurrun

Update licensing information: The FSF changed postal address.

Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk

bb270c08 12/22/2005 01:10 AM Diego Biurrun

COSMETICS: tabs --> spaces, some prettyprinting

Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk

115329f1 12/17/2005 06:14 PM Diego Biurrun

COSMETICS: Remove all trailing whitespace.

Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk

4733abcb 12/12/2005 01:56 AM Måns Rullgård

use PRIxN, %zd, %td formats where needed

Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk

6b0bdc75 11/13/2005 03:26 AM Alex Beregszaszi

support for unlimited feed size

Originally committed as revision 4697 to svn://svn.ffmpeg.org/ffmpeg/trunk

90f9c440 11/13/2005 03:12 AM Alex Beregszaszi

debug the launch commandline and new connections

Originally committed as revision 4695 to svn://svn.ffmpeg.org/ffmpeg/trunk

ac6a655b 11/13/2005 01:45 AM Alex Beregszaszi

Make Launch more appropriate with support for full paths for the ffmpeg binary

Originally committed as revision 4693 to svn://svn.ffmpeg.org/ffmpeg/trunk

4b4f38e4 11/13/2005 01:41 AM Alex Beregszaszi

Support Launch when BindAddress is not INADDR_ANY or localhost. Also fix a possible buffer overflow

Originally committed as revision 4692 to svn://svn.ffmpeg.org/ffmpeg/trunk

edfdd798 10/14/2005 05:29 PM Alex Beregszaszi

10l, dont make bandwidth statistics negative when feed stops being sent (it was decreased every time feed sending was aborted)

Originally committed as revision 4642 to svn://svn.ffmpeg.org/ffmpeg/trunk

8d931070 07/18/2005 09:02 AM Michael Niedermayer

ffserver segfault & other fatal failure fixes

Originally committed as revision 4454 to svn://svn.ffmpeg.org/ffmpeg/trunk

01f4895c 07/17/2005 10:24 PM Michael Niedermayer

changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility

Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk

e8d27bc3 05/07/2005 12:56 AM Philip Gladstone

Turn on the seeking support for ffm streams. Now means that streams are
played from the current time rahter than from the beginning

Originally committed as revision 4194 to svn://svn.ffmpeg.org/ffmpeg/trunk

291fe90a 05/06/2005 03:21 AM Philip Gladstone

Fill out some mandatory fields in the Codec structure. Also add fields in
the configuration to allow you to set Debug and Strict values.

Originally committed as revision 4185 to svn://svn.ffmpeg.org/ffmpeg/trunk

c0df9d75 04/30/2005 09:43 PM Michael Niedermayer

switch to native time bases

Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk

7c054ea7 01/03/2005 02:42 AM Philip Gladstone

ffserver now runs again (sort of).

  • In the test cases, the swf, asf, jpg file formats all work
  • The avi case doesn't play in winamp. I suspect that the duration field
    of zero confuses it
  • The RM doesn't play. This always was pretty flaky.

Originally committed as revision 3795 to svn://svn.ffmpeg.org/ffmpeg/trunk

6ba5cbc6 08/12/2004 12:09 AM Petr Doubek

HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
tested and submitted by (Torsten Spindler <spindler at hbt dot arch dot ethz dot ch>)

Originally committed as revision 3381 to svn://svn.ffmpeg.org/ffmpeg/trunk

668fe04e 07/28/2004 10:24 AM Michael Niedermayer

min rate should be 0 by default

Originally committed as revision 3362 to svn://svn.ffmpeg.org/ffmpeg/trunk

53e2f9ca 07/25/2004 11:59 AM Michael Niedermayer

ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)

Originally committed as revision 3340 to svn://svn.ffmpeg.org/ffmpeg/trunk

e928649b 05/29/2004 02:06 AM Michael Niedermayer

pass AVPacket into av_write_frame()
fixes the random dts/pts during encoding
asf preroll fix
no more initial zero frames for b frame encoding
mpeg-es dts during demuxing fixed
.ffm timestamp scale fixed, ffm is still broken though

Originally committed as revision 3168 to svn://svn.ffmpeg.org/ffmpeg/trunk

4568325a 04/06/2004 06:31 AM Roman Shaposhnik
  • making it possible to specify recording date and time in a stream

Originally committed as revision 2971 to svn://svn.ffmpeg.org/ffmpeg/trunk

7906085f 03/24/2004 11:32 PM Falk Hüffner

warning patrol

Originally committed as revision 2925 to svn://svn.ffmpeg.org/ffmpeg/trunk

bc874dae 03/03/2004 03:41 PM Michel Bardiaux

av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)

Originally committed as revision 2840 to svn://svn.ffmpeg.org/ffmpeg/trunk

46026f4e 02/05/2004 05:47 PM Henning Haaland Kulander

VideoBufferSize option patch by ("Henning Haaland Kulander" <hennikul at ifi dot uio dot no>)

Originally committed as revision 2749 to svn://svn.ffmpeg.org/ffmpeg/trunk

d445a7e9 11/19/2003 02:23 AM Philip Gladstone

Changed a bunch of calls to sprintf to snprintf to protect against buffer
overflows.

Fix streaming from non-streaming ffm files. It turned out that you
always got 'index & id do not match' errors.

Add some more error detection on getting FFM feeds

Originally committed as revision 2523 to svn://svn.ffmpeg.org/ffmpeg/trunk

e240a0bb 11/10/2003 07:02 PM Fabrice Bellard

simpler bandwidth allocation for RTSP streaming - use av_read_frame() - initial support for raw MPEG2 transport stream streaming using RTSP

Originally committed as revision 2506 to svn://svn.ffmpeg.org/ffmpeg/trunk

8bc80f8b 09/27/2003 01:23 AM Philip Gladstone

Minor bugfix to prevent segfault if a malloc fails. I have no idea what
will happen, but at least this crash is gone.

Originally committed as revision 2307 to svn://svn.ffmpeg.org/ffmpeg/trunk

7b7d86f1 09/11/2003 10:51 PM Fabrice Bellard

simplified version handling

Originally committed as revision 2264 to svn://svn.ffmpeg.org/ffmpeg/trunk

33f25681 09/08/2003 10:13 PM Fabrice Bellard

removed ctype.h

Originally committed as revision 2234 to svn://svn.ffmpeg.org/ffmpeg/trunk

02d504a7 08/24/2003 03:29 PM Fabrice Bellard

more sections in help - copyright fixes

Originally committed as revision 2143 to svn://svn.ffmpeg.org/ffmpeg/trunk

7d1c3fc1 07/29/2003 02:09 AM Michael Niedermayer

rate distortion mb decision support
fix decoding of old %16!=0 divx
fix assertion failure in motion_est.c

Originally committed as revision 2094 to svn://svn.ffmpeg.org/ffmpeg/trunk

bc351386 07/17/2003 10:31 AM Fabrice Bellard

added RTP/TCP protocol support

Originally committed as revision 2063 to svn://svn.ffmpeg.org/ffmpeg/trunk

1bc1cfdd 07/11/2003 10:30 PM Giancarlo Formicuccia

- Gracefully handle the case where not all the streams are requested/wanted
from the client. Simply ignore the unwanted/unasked streams.
- Don't need to pool() for every input character! (the socket is nonblocking,
so the loop is ok).
- Partially resurrect compute_send_delay for avoiding udp flood. Without a...

17705a34 07/03/2003 10:56 PM Michael Niedermayer

Missing ffserver.c format parameter fix by (Giancarlo Formicuccia <ilsensine at inwind dot it>)

Originally committed as revision 2005 to svn://svn.ffmpeg.org/ffmpeg/trunk

1b52b6bd 07/03/2003 09:09 PM Michael Niedermayer

segfault fix by (Giancarlo Formicuccia <ilsensine at inwind dot it>)

Originally committed as revision 2003 to svn://svn.ffmpeg.org/ffmpeg/trunk

94d9ad5f 06/29/2003 01:25 AM Giancarlo Formicuccia
  • fix for read()
    Reading 1-char per read() is the less intrusive way to fix the behaviour I observed.
    Not a nice fix, but the client requests shouldn't steal so much bandwidth
  • fix for find_rtp_session_with_url.
    Note that mplayer send one PLAY request per stream, I don't know if this should be handled...
03ff071a 04/12/2003 03:03 AM Philip Gladstone

Fix a horrible bug with the launch keyword not handling arguments of length 1!

Originally committed as revision 1761 to svn://svn.ffmpeg.org/ffmpeg/trunk

f0ef6240 04/12/2003 02:27 AM Philip Gladstone

Applied Roumen Petrov patch to fix crash/memory leak

Originally committed as revision 1758 to svn://svn.ffmpeg.org/ffmpeg/trunk

a7beab73 04/11/2003 09:43 AM Roman Shaposhnik

bunch of small thing patch by (Roman Shaposhnick <rvs at sun dot com>)

Originally committed as revision 1753 to svn://svn.ffmpeg.org/ffmpeg/trunk

e322ea48 04/09/2003 02:16 AM Philip Gladstone
  • Add Video4MotionVector in a stream description to behave like the -4mv flag
  • 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

0df65975 04/04/2003 01:29 PM Andriy Rysin

RTSP "OPTIONS" command patch by (Andriy Rysin <arysin at bcsii dot net>)

Originally committed as revision 1728 to svn://svn.ffmpeg.org/ffmpeg/trunk

b88ba823 03/26/2003 10:30 AM Mark Hills

ffserver deallocate ctx->streams on closing patch by (Mark Hills <mark at pogo dot org dot uk>)

Originally committed as revision 1704 to svn://svn.ffmpeg.org/ffmpeg/trunk