| Branch: | Revision:

ffmpeg / ffserver.c @ 91861ce2

History | View | Annotate | Download (155 KB)

# Date Author Comment
003c32e7 02/18/2011 06:52 PM Martin Storsjö

ffserver: Try matching the RTSP url without a trailing slash

If the client sends PLAY/PAUSE requests with the same url as
specified in Content-Base, these requests may have urls with
trailing slashes.
(cherry picked from commit c2ca851b234e169b50730ef357aeade8047491eb)

1b98107c 02/18/2011 06:52 PM Anton Khirnov

Move find_info_tag to lavu and add av_ prefix to it

Signed-off-by: Janne Grunau <>
(cherry picked from commit ab0287fcbdebc8ff416214535d7ee8424406990e)

ee60e04c 02/18/2011 06:52 PM Anton Khirnov

Replace remaining uses of parse_date with av_parse_time.

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 9fcae9735e3b97366dcee9ca3c2f6cf4faf6756f)

34c340d4 02/18/2011 06:52 PM Nicolas George

ffserver: set the sample aspect ratio


It seems that ffserver sets sample_aspect_ratio to an invalid value and lavf
rejects it.

I am not sure what I am doing here, but the attached patch actually solves
something: using the following config:

CustomLog -...

7ffe76e5 02/16/2011 10:00 PM Reinhard Tartler

Merge libavcore into libavutil

Done to keep ABI compatible. Otherwise this is just silly

5658abf8 01/26/2011 02:43 AM Mans Rullgard

ffserver: put gcc attribute under proper ifdef
(cherry picked from commit efa6ce9982ffde33b7303498ff28fcf39ff68b8d)

bf7aa642 01/23/2011 06:32 PM Reinhard Tartler

ffserver: cleanup

remove the trivial function do_switch_stream as it doesn't help to make
the code easier to understand.
(cherry picked from commit 305ca590cfdbb8ffbe32c6ed26825489a640ff05)

2a127067 01/07/2011 06:48 PM Luca Barbato

Unbreak ffserver

Make sure the sample_aspect_ratio is 0 and not 0/0.

Originally committed as revision 26254 to svn://

77223c53 01/02/2011 10:10 AM Martin Storsjö

rtsp: Pass the method name to ff_rtsp_parse_line

Originally committed as revision 26191 to svn://

6e872935 11/04/2010 11:07 PM Stefano Sabatini

Implement get_preset_file() in cmdutils.h and use it to factorize code
from ffmpeg.c and ffserver.c.

Originally committed as revision 25679 to svn://

aff88101 10/15/2010 07:09 PM Aurelien Jacobs

ffserver: use a local MAX_STREAMS limit

Originally committed as revision 25495 to svn://

9389b925 10/15/2010 07:09 PM Aurelien Jacobs

ffserver: fix prepare_sdp_description() to dynamically allocate streams

Originally committed as revision 25494 to svn://

126b638e 07/26/2010 11:12 PM Stefano Sabatini

Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in

This change also adds a linking-time dependency of libavcodec and of...

0aee2a57 07/08/2010 09:21 AM Howard Chu

Also use 503 for bandwidth limit exceeded

Originally committed as revision 24107 to svn://

2a22187f 07/08/2010 08:59 AM Howard Chu

Fix "server too busy" status code

Originally committed as revision 24105 to svn://

f3bfe388 06/27/2010 02:16 PM Måns Rullgård

Make ff_url_split() public

ff_url_split() is retained as an alias, as it was used by ffserver,
to avoid breaking ABI compatibility with it.

Originally committed as revision 23822 to svn://

5634f30c 06/22/2010 06:45 AM Martin Storsjö

ffserver: Use avcodec_copy_context instead of manually copying an AVCodecContext

Originally committed as revision 23692 to svn://

d9aac267 06/16/2010 01:12 AM Howard Chu

When reading a stream, should retry on EAGAIN instead of just failing. Also,
when reading a live feed, should retry regardless of whether any client has
opened the stream.

Originally committed as revision 23621 to svn://

8190f62f 06/08/2010 09:55 AM Howard Chu

Support presets in ffserver.conf

Originally committed as revision 23524 to svn://

f475f35f 06/03/2010 08:58 PM Martin Storsjö

ffserver: Calculate cur_pts using first_pts as origin instead of ist->start_time

This fixes cases where ist->start_time wasn't initialized. This also makes
cur_pts calculated against the same origin for all streams.

Originally committed as revision 23450 to svn://

3b963552 06/02/2010 07:09 AM Martin Storsjö

ffserver: Allow floating point audio bit rates

This allows setting bit rates that aren't an exact multiple of 1000.

Originally committed as revision 23419 to svn://

577ee948 05/25/2010 07:23 PM Martin Storsjö

ffserver: Send a Content-Base header in the reply to RTSP DESCRIBE requests

This is needed for QuickTime Player to be able to connect properly.

Originally committed as revision 23325 to svn://

111c9359 05/24/2010 08:24 PM Martin Storsjö

ffserver: Fix one of the codec parameter checks

This is probably what was originally intended; the codec pointers are all NULL.

Fix by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23295 to svn://

a5ba4ced 05/24/2010 08:08 PM Martin Storsjö

ffserver: Fix streaming with more than one stream

Fix by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23294 to svn://

e175b55e 05/24/2010 07:59 PM Howard Chu

ffserver: Fix extradata handling

Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23293 to svn://

c966c912 05/24/2010 07:23 PM Martin Storsjö

ffserver: Fix an out of bounds read

Fix by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23292 to svn://

9cc9a155 05/24/2010 07:12 PM Martin Storsjö

ffserver: Fix another memory leak

Don't allocate st->codec, it will be overwritten by the memcpy a few
lines further down.

Fix by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23291 to svn://

ea4f8aab 05/24/2010 07:05 PM Howard Chu

ffserver: Plug some memory leaks

Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23290 to svn://

576fb48e 05/23/2010 08:53 AM Martin Storsjö

Make ff_random_get_seed public, rename to av_get_random_seed, export the header

Keep an old ff_ named function for binary compatibility until the
next major bump.

Originally committed as revision 23254 to svn://

686d6f40 05/21/2010 07:59 AM Howard Chu

ffserver: Avoid busylooping while reading non-blocking input

Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23210 to svn://

90c92100 05/18/2010 11:46 AM Martin Storsjö

Cosmetics: reindent

Originally committed as revision 23156 to svn://

1bf5228e 05/18/2010 11:45 AM Howard Chu

ffserver: Don't set me_method unconditionally

Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23155 to svn://

0156fcf2 05/18/2010 11:16 AM Howard Chu

ffserver: Write proper GMT date/times in Date headers

Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23154 to svn://

43d09faf 05/17/2010 05:34 PM Martin Storsjö

ffserver: Make sure a destination URL is set when creating the SDP

Debugged by Howard Chu, hyc at highlandsun dot com.

Originally committed as revision 23151 to svn://

2ef6c124 04/25/2010 02:27 PM Stefano Sabatini

Mark av_metadata_set() as deprecated, and use av_metadata_set2()
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://

472e12f5 04/24/2010 10:39 AM Stefano Sabatini

Implement ffserver.c:report_config_error() and a macro for logging
error messages / updating the error count.

Originally committed as revision 22960 to svn://

6675a5bf 04/24/2010 10:39 AM Stefano Sabatini

Statically initialize ffserver.c:config_filename, simplify.

Originally committed as revision 22959 to svn://

bacde646 04/19/2010 11:42 AM Luca Barbato

Make ffserver support rfc3550

Originally committed as revision 22907 to svn://

58f48adb 04/07/2010 08:06 PM Benjamin Larsson

Add DynamicACL support for FFserver.

Originally committed as revision 22815 to svn://

d9521cb1 03/31/2010 09:02 PM Ronald S. Bultje

Fix FFM-based streaming from ffmpeg to ffserver. The basic problem is that
we'd memset() the codec context to zero, thereby setting audio input to U8
and video to YUV420P. For most video encoders, that actually works, but for
most audio codecs, it doesn't. This patch changes defaults to those set by...

cc947f04 03/31/2010 12:29 PM Jean-Daniel Dupas

Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.

Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://

72415b2a 03/30/2010 11:30 PM Stefano Sabatini

Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://

2626308a 03/25/2010 09:48 PM Martin Storsjö

Actually parse the auth headers in RTSP

Originally committed as revision 22677 to svn://

22f73dcc 03/08/2010 06:43 PM Måns Rullgård

Move resolve_host() to ffserver.c

This deprecated function is only used by ffserver, yet does not have
a prototype visible there.

In the long term, ffserver should be made IPv6-aware. In the meantime,
this change removes cruft from lavf and fixes some warnings in ffserver....

c5c6e67c 03/08/2010 09:03 AM Martin Storsjö

Rename url_split to ff_url_split

Since this function isn't in the public API, it should have an ff_ prefix.

Originally committed as revision 22321 to svn://

ffabdaa1 03/08/2010 12:26 AM Måns Rullgård

ffserver: remove bogus comment

Originally committed as revision 22303 to svn://

6580d5e3 03/07/2010 10:18 PM Måns Rullgård

Remove hacks not required since HAVE_AV_CONFIG_H was unset for the apps

Originally committed as revision 22295 to svn://

acd0026c 03/07/2010 10:18 PM Måns Rullgård

ffserver: do not use intreadwrite.h

intreadwrite.h is not part of the public API and should thus
not be used by the ff* applications.

Originally committed as revision 22293 to svn://

fd7bec5e 03/06/2010 07:41 PM Måns Rullgård

ffserver: use av_stristr()

Originally committed as revision 22252 to svn://

19c8c4ec 03/03/2010 06:41 PM Ronald S. Bultje

Update to work with chunked encoding HTTP streams (as served by FFmpeg since
a few months now). Fixes issue 1738.

Originally committed as revision 22175 to svn://

3307e6ea 02/23/2010 12:35 AM Ronald S. Bultje

Prefix non-static RTSP functions with ff_.

Originally committed as revision 21974 to svn://

7f6a384a 01/04/2010 05:55 PM Diego Biurrun

Mark http_log() as static; it is only used in this file.

Originally committed as revision 21017 to svn://

aa13b573 01/01/2010 11:56 PM Stefano Sabatini

Use av_match_ext() in place of the deprecated match_ext() function.

Originally committed as revision 21000 to svn://

0f52ef1a 01/01/2010 12:58 PM Stefano Sabatini

Use av_guess_format() in place of the deprecated guess_format().

Originally committed as revision 20994 to svn://

1642ee43 12/31/2009 02:12 PM Stefano Sabatini

Deprecate and mark for deletion the function guess_stream_format(),
and clone its code to ffserver_guess_format() in ffserver.c.

guess_stream_format() is hackish since it relies on some undocumented
properties of the name of the muxers (wich is currently only relevant...

992f8eae 11/29/2009 11:12 PM Stefano Sabatini

Factorize common commandline options definition.

Originally committed as revision 20664 to svn://

8447f0bd 11/19/2009 04:35 PM Michael Niedermayer

Split show_formats().

Originally committed as revision 20553 to svn://

43d160fd 10/02/2009 07:06 PM Stefano Sabatini

Prefer "loglevel" over "logging level number or string" as argname of
the loglevel command line option.

Make the loglevel option help message more clear, since the option
argument is shown as a single token, and make the whole message better
aligned with the other help messages....

a392f82a 09/29/2009 09:08 PM Diego Biurrun

Remove disabled code cruft.

Originally committed as revision 20087 to svn://

7087a0f5 09/26/2009 11:30 PM Stefano Sabatini

Add a -loglevel command line option to ffserver.

The -loglevel option makes possible to set the logging level used by
the libav* libraries.

Originally committed as revision 20035 to svn://

c64c0a9b 09/10/2009 07:08 PM Benjamin Larsson

Move get_arg to avoid future declaration of function when
new code is added.

Originally committed as revision 19815 to svn://

5e567aae 07/19/2009 10:44 AM Diego Biurrun

Consistently lowercase all HTML tags.

Originally committed as revision 19464 to svn://

64159a58 03/21/2009 10:32 AM Baptiste Coudurier

check if feed max file size is too small

Originally committed as revision 18109 to svn://

1f611549 03/21/2009 10:29 AM Baptiste Coudurier

cosmetics, reindent and remove empty line

Originally committed as revision 18108 to svn://

861ec13a 03/21/2009 10:28 AM Baptiste Coudurier

new Truncate option which will make feeder truncate feed file

Originally committed as revision 18107 to svn://

85fe4ae0 03/21/2009 09:58 AM Baptiste Coudurier

do not call av_find_stream_info if stream is ffm, should fix stalling

Originally committed as revision 18104 to svn://

0bdd8b85 03/21/2009 09:56 AM Baptiste Coudurier

send busy reply if max connections number is exceeded

Originally committed as revision 18103 to svn://

7e24aa0c 03/21/2009 06:52 AM Baptiste Coudurier

adjust write index if not set

Originally committed as revision 18097 to svn://

20f93c3c 03/20/2009 01:07 AM Baptiste Coudurier

check av_find_stream_info return value

Originally committed as revision 18060 to svn://

77553ae3 03/20/2009 01:05 AM Baptiste Coudurier

uniformize log messages and add some more

Originally committed as revision 18059 to svn://

042819c5 03/20/2009 01:00 AM Baptiste Coudurier

use lfg and ff_random_get_seed instead of deprecated av_random

Originally committed as revision 18058 to svn://

637af098 03/20/2009 12:55 AM Baptiste Coudurier

check if feed and stream already exist before registering new one

Originally committed as revision 18057 to svn://

49ceb58b 03/08/2009 02:33 PM Michael Niedermayer

Bump major version of libavutil due to FIFO fixes.
The current API/ABI should not be considered stable yet, further ABI/API
breakage is possible without major bumps.

Originally committed as revision 17871 to svn://

5ee999b8 03/01/2009 02:56 PM Aurelien Jacobs

convert ffserver to new metadata API

Originally committed as revision 17685 to svn://

d8f28a77 02/22/2009 02:06 AM Baptiste Coudurier

add bandwidth before failing if feed is already being received

Originally committed as revision 17516 to svn://

00473727 02/22/2009 02:04 AM Baptiste Coudurier

do not set error if an unknown parameter is in config file, just skip

Originally committed as revision 17515 to svn://

a9e534d5 02/21/2009 10:26 PM Ronald S. Bultje

Rename RTSPHeader to RTSPMessageHeader to reflect more clearly what the
structure is meant to represent. See "[PATCH] rtsp.[ch]: RTSPHeader ->
RTSPServerResponse" and "[PATCH] document rtsp.h" threads on ML.

Originally committed as revision 17504 to svn://

d541a7d2 02/21/2009 02:40 PM Ronald S. Bultje

Change sizeof(struct_type) to sizeof(variable).

Originally committed as revision 17474 to svn://

2779cdad 02/12/2009 02:23 AM Patrik Kullman

Check return value of ffm_write_write_index and ffm_read_write_index.
Patch by Patrik Kullman, patrik at yes dot nu

Originally committed as revision 17174 to svn://

8e2fd8e1 02/08/2009 08:27 AM Stefano Sabatini

Replace the calls to the deprecated av_alloc_format_context() with
corresponding calls to avformat_alloc_context().

Originally committed as revision 17048 to svn://

302879cb 02/06/2009 10:35 AM Luca Abeni

Split rtp.h in rtp.h, rtpdec.h, and rtpenc.h

Originally committed as revision 17016 to svn://

b516ecdd 02/05/2009 05:00 PM Ronald S. Bultje

Delete an enum and a function typedef that aren't used anywhere, and
move move a struct/typedef in rtsp.h that is only used in ffserver.c into
ffserver.c. See "[PATCH] rtsp.h: move/remove unused thingies" thread on ML.

Originally committed as revision 17005 to svn://

cf2c671f 01/30/2009 06:44 PM Diego Biurrun

Add 'void' keyword to parameterless function declaration.

Originally committed as revision 16861 to svn://

9c868219 01/18/2009 11:04 PM Stefano Sabatini

Replace calls to the deprecated function av_init_random() with
corresponding calls to av_random_init().

Originally committed as revision 16682 to svn://

2bb6eba2 01/17/2009 12:21 PM Aurelien Jacobs

remove ff_get_fourcc() and use AV_RL32() instead

Originally committed as revision 16654 to svn://

b250f9c6 01/13/2009 11:44 PM Aurelien Jacobs

Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://

959da985 01/13/2009 11:36 PM Stefano Sabatini

Include libavformat/avformat.h before all the other libav* headers.
This is safer since they may use the symbol LIBAVFORMAT_BUILD defined
in avformat.h.

Originally committed as revision 16589 to svn://

1d6eeebe 01/09/2009 08:03 PM Aurelien Jacobs

initialize AVFormatContext before calling av_write_header()

Originally committed as revision 16505 to svn://

aed46465 12/30/2008 12:02 PM Carl Eugen Hoyos

Silence two icc warnings:
warning #188: enumerated type mixed with another type
audio_enc.codec_id = audio_id;


5c548937 12/19/2008 10:33 PM Stefano Sabatini

Cosmetics, change variable name "o2" to "o" in ffserver_opt_default().

Originally committed as revision 16242 to svn://

f16dd7e6 12/19/2008 10:29 PM Stefano Sabatini

Remove calls to deprecated av_set_string2() with calls to

Originally committed as revision 16241 to svn://

10ba7404 11/29/2008 12:22 PM Stefano Sabatini

s/FFserver/ffserver/ in the help message invocation synopsis.

See the thread: "Define cmdline_program_name and use it in show_help".

Originally committed as revision 15952 to svn://

a3341b9d 10/25/2008 12:51 AM Baptiste Coudurier

cosmetics: ffserver -> FFserver

Originally committed as revision 15695 to svn://

f9739144 10/25/2008 12:50 AM Baptiste Coudurier

cosmetics, indentation

Originally committed as revision 15694 to svn://

a69b06be 10/25/2008 12:49 AM Baptiste Coudurier

check if stream is set, fix potential segv

Originally committed as revision 15693 to svn://

37d3e066 10/21/2008 09:40 PM Aurelien Jacobs

uses FF_ARRAY_ELEMS() where appropriate

Originally committed as revision 15662 to svn://

0be4b8d9 10/01/2008 08:45 PM Baptiste Coudurier

cosmetics, remove useless spaces

Originally committed as revision 15506 to svn://

90abbdba 09/30/2008 01:18 PM Ronald S. Bultje

Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
that it only describes the lower-level transport (TCP vs. UDP) and not the
actual data layout (e.g. RDT vs. RTP). See discussion in "Realmedia patch"
thread on ML.

Originally committed as revision 15481 to svn://

dc771f6b 09/29/2008 07:15 AM Diego Pettenò

Remove some format string warnings.
patch by Diego Pettenò, flameeyes gmail com

Originally committed as revision 15461 to svn://

df1a4b11 09/28/2008 07:33 PM Michael Niedermayer

Rename opt_default() so it will not conflict with the one from ffmpeg.c
when it is moved to cmdutils.c/h.

Originally committed as revision 15449 to svn://