Statistics
| Branch: | Revision:

ffmpeg / ffserver.c @ 2f821b03

History | View | Annotate | Download (153 KB)

# Date Author Comment
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://svn.ffmpeg.org/ffmpeg/trunk

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

ffserver: remove bogus comment

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

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

ffserver: use av_stristr()

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

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://svn.ffmpeg.org/ffmpeg/trunk

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

Prefix non-static RTSP functions with ff_.

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

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

Split show_formats().

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

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

Consistently lowercase all HTML tags.

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

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://svn.ffmpeg.org/ffmpeg/trunk

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

cosmetics, reindent and remove empty line

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

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

adjust write index if not set

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

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

check av_find_stream_info return value

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

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

uniformize log messages and add some more

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

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

convert ffserver to new metadata API

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

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

Change sizeof(struct_type) to sizeof(variable).

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

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

Add 'void' keyword to parameterless function declaration.

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

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

initialize AVFormatContext before calling av_write_header()

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

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

Silence two icc warnings:
/home/melanson/fate/source/ffserver.c(4349):
warning #188: enumerated type mixed with another type
audio_enc.codec_id = audio_id;
^

/home/melanson/fate/source/ffserver.c(4354):...

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://svn.ffmpeg.org/ffmpeg/trunk

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

Remove calls to deprecated av_set_string2() with calls to
av_set_string3().

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

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://svn.ffmpeg.org/ffmpeg/trunk

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

cosmetics: ffserver -> FFserver

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

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

cosmetics, indentation

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

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

check if stream is set, fix potential segv

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

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

uses FF_ARRAY_ELEMS() where appropriate

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

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

cosmetics, remove useless spaces

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

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

637b638e 09/24/2008 05:11 PM Baptiste Coudurier

only write trailer when state says so, should fix issue #646

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

31296f6e 09/07/2008 05:05 AM Baptiste Coudurier

add missing html start tag to ffserver status html page

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

a3aa4fed 09/07/2008 04:56 AM Baptiste Coudurier

cleanup, merge snprintf calls

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

a7f361eb 09/07/2008 04:16 AM Baptiste Coudurier

100l, compute correctly poll_table size when allocating

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

4af92de6 09/03/2008 08:10 PM Stefano Sabatini

Make the nb_max_connections and nb_connections int variables unsigned.

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

1c9ff179 09/03/2008 06:16 PM Stefano Sabatini

Make the maximum number of simultaneous HTTP connections handled by
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

ea452b54 08/13/2008 05:22 PM Aurelien Jacobs

strcasecmp() requires #include <strings.h>

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

29d3ed3b 08/13/2008 10:03 AM Aurelien Jacobs

ffserver: SA_RESTART and unsetenv require _XOPEN_SOURCE

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

e16190fa 07/24/2008 09:12 PM Diego Biurrun

cosmetics: typo fixes

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

59e7894c 07/16/2008 03:21 AM Baptiste Coudurier

print AVCodecContext address instead of AVClass, better when multiple instances of same codecs are used, based on r14237

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

7ac884c5 07/09/2008 09:51 PM Stefano Sabatini

Fix a warning in ffserver.c caused by the use of the function
av_set_string() deprecated since r14134.

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

a9d9aa36 06/25/2008 07:55 PM Baptiste Coudurier

revert r13867, - reference stdout, I was drunk

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

80b616fc 06/25/2008 07:00 PM Baptiste Coudurier

use http_log now that logfile is setup

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

f10d55ed 06/25/2008 06:51 PM Baptiste Coudurier

move logfile setup right after config parsing

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

f0754ad8 06/25/2008 06:51 PM Baptiste Coudurier

remove useless init

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

8bf61f5b 06/24/2008 10:30 PM Stefano Sabatini

Reindent.

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

5dc8eeb6 06/24/2008 10:27 PM Stefano Sabatini

Make ffserver show launched commandlines not only in debug-mode.

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

6aada9b1 06/24/2008 09:35 PM Stefano Sabatini

Use http_log() rather than printing on stdout to show the launched
commandlines.

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

40444a59 06/24/2008 09:26 PM Stefano Sabatini

Make ffserver show each launched commandline just before to launch
them rather than print them when parsing the configuration file. This
way those commandlines are not showed anymore in no-launch mode.

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

14c43f91 06/24/2008 02:02 AM Baptiste Coudurier

log when feed is already being received

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

65f2f028 06/24/2008 02:00 AM Baptiste Coudurier

reindent

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

cb51aef1 06/23/2008 07:57 PM Baptiste Coudurier

copy extradata if present

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

496a6132 06/23/2008 07:43 PM Stefano Sabatini

Make ffserver daemon chdir()s just after log init. This way a
relative path for the logfile is resolved according to the directory
where ffserver has been launched, as the user expects.

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

b0675954 06/23/2008 05:57 PM Baptiste Coudurier

fix segv, fmt_ctx is not set for rtsp

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

ace21da3 06/23/2008 08:12 AM Baptiste Coudurier

cosmetics, braces placement

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

3ab29d8e 06/23/2008 07:28 AM Baptiste Coudurier

10l, do not use ctx before being set, fix segv

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

dc3a6a36 06/23/2008 03:21 AM Baptiste Coudurier

fix compilation, this should be better

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

4def51fa 06/23/2008 03:18 AM Baptiste Coudurier

10l, move init after possible goto

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

8f56ccca 06/23/2008 03:18 AM Baptiste Coudurier

simplify, use ist

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

250be719 06/23/2008 03:16 AM Baptiste Coudurier

fix source stream, source_index is refering to fmt_in, needs testing

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

d80904cc 06/23/2008 02:41 AM Baptiste Coudurier

simplify

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

e21ac209 06/23/2008 02:16 AM Baptiste Coudurier

no need to print date anymore since done in http_log

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

3d9cc27d 06/22/2008 03:42 AM Baptiste Coudurier

move code setting output parameters after possible failure

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

697efa36 06/22/2008 03:30 AM Baptiste Coudurier

move code after possible failure, so no need to free

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

e6f0deab 06/22/2008 03:25 AM Baptiste Coudurier

check av_open_input_stream error

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

fbc63144 06/22/2008 03:20 AM Baptiste Coudurier

remove return 1, we don't change state, we are still sending data

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

86771c68 06/22/2008 02:34 AM Baptiste Coudurier

free pb

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

f2972c8c 06/22/2008 02:31 AM Baptiste Coudurier

use av_open_input_stream

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

381ec677 06/22/2008 02:15 AM Baptiste Coudurier

do not allocate st->codec, it will be overwritten later; fix memleak

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

0b459fb2 06/22/2008 01:31 AM Baptiste Coudurier

log to stderr

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

bcd3ce59 06/22/2008 01:30 AM Baptiste Coudurier

add callback for av_log

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

82e0be62 06/22/2008 01:13 AM Baptiste Coudurier

no need to print date anymore since done in http_log

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

9fd3442f 06/22/2008 01:12 AM Baptiste Coudurier

use ctime1

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