Commit Graph

328 Commits

Author SHA1 Message Date
Benjamin Larsson
c64c0a9b76 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
2009-09-10 19:08:03 +00:00
Diego Biurrun
5e567aae48 Consistently lowercase all HTML tags.
Originally committed as revision 19464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-19 10:44:36 +00:00
Baptiste Coudurier
64159a588b check if feed max file size is too small
Originally committed as revision 18109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 10:32:43 +00:00
Baptiste Coudurier
1f611549e2 cosmetics, reindent and remove empty line
Originally committed as revision 18108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 10:29:37 +00:00
Baptiste Coudurier
861ec13aae new Truncate option which will make feeder truncate feed file
Originally committed as revision 18107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 10:28:49 +00:00
Baptiste Coudurier
85fe4ae0d0 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
2009-03-21 09:58:07 +00:00
Baptiste Coudurier
0bdd8b858f send busy reply if max connections number is exceeded
Originally committed as revision 18103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 09:56:25 +00:00
Baptiste Coudurier
7e24aa0c13 adjust write index if not set
Originally committed as revision 18097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 06:52:55 +00:00
Baptiste Coudurier
20f93c3ccf check av_find_stream_info return value
Originally committed as revision 18060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 01:07:22 +00:00
Baptiste Coudurier
77553ae360 uniformize log messages and add some more
Originally committed as revision 18059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 01:05:51 +00:00
Baptiste Coudurier
042819c520 use lfg and ff_random_get_seed instead of deprecated av_random
Originally committed as revision 18058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 01:00:53 +00:00
Baptiste Coudurier
637af098fd check if feed and stream already exist before registering new one
Originally committed as revision 18057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 00:55:00 +00:00
Michael Niedermayer
49ceb58bf6 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
2009-03-08 14:33:30 +00:00
Aurelien Jacobs
5ee999b8e7 convert ffserver to new metadata API
Originally committed as revision 17685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 14:56:27 +00:00
Baptiste Coudurier
d8f28a7727 add bandwidth before failing if feed is already being received
Originally committed as revision 17516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 02:06:55 +00:00
Baptiste Coudurier
0047372722 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
2009-02-22 02:04:24 +00:00
Ronald S. Bultje
a9e534d561 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
2009-02-21 22:26:44 +00:00
Ronald S. Bultje
d541a7d2d1 Change sizeof(struct_type) to sizeof(variable).
Originally committed as revision 17474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-21 14:40:19 +00:00
Patrik Kullman
2779cdad07 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
2009-02-12 02:23:25 +00:00
Stefano Sabatini
8e2fd8e1d4 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
2009-02-08 08:27:26 +00:00
Luca Abeni
302879cb36 Split rtp.h in rtp.h, rtpdec.h, and rtpenc.h
Originally committed as revision 17016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-06 10:35:52 +00:00
Ronald S. Bultje
b516ecdd12 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
2009-02-05 17:00:10 +00:00
Diego Biurrun
cf2c671f82 Add 'void' keyword to parameterless function declaration.
Originally committed as revision 16861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-30 18:44:38 +00:00
Stefano Sabatini
9c868219e9 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
2009-01-18 23:04:33 +00:00
Aurelien Jacobs
2bb6eba21d remove ff_get_fourcc() and use AV_RL32() instead
Originally committed as revision 16654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 12:21:01 +00:00
Aurelien Jacobs
b250f9c66d 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
2009-01-13 23:44:16 +00:00
Stefano Sabatini
959da985b0 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
2009-01-13 23:36:06 +00:00
Aurelien Jacobs
1d6eeebe08 initialize AVFormatContext before calling av_write_header()
Originally committed as revision 16505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-09 20:03:53 +00:00
Carl Eugen Hoyos
aed464654b 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):
warning #188: enumerated type mixed with another type
                          video_enc.codec_id = video_id;
                                             ^

Originally committed as revision 16397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-30 12:02:35 +00:00
Stefano Sabatini
5c548937e0 Cosmetics, change variable name "o2" to "o" in ffserver_opt_default().
Originally committed as revision 16242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-19 22:33:15 +00:00
Stefano Sabatini
f16dd7e65a 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
2008-12-19 22:29:30 +00:00
Stefano Sabatini
10ba7404d2 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
2008-11-29 12:22:22 +00:00
Baptiste Coudurier
a3341b9da6 cosmetics: ffserver -> FFserver
Originally committed as revision 15695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-25 00:51:45 +00:00
Baptiste Coudurier
f973914406 cosmetics, indentation
Originally committed as revision 15694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-25 00:50:23 +00:00
Baptiste Coudurier
a69b06be93 check if stream is set, fix potential segv
Originally committed as revision 15693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-25 00:49:56 +00:00
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-21 21:40:24 +00:00
Baptiste Coudurier
0be4b8d930 cosmetics, remove useless spaces
Originally committed as revision 15506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-01 20:45:06 +00:00
Ronald S. Bultje
90abbdba1e 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
2008-09-30 13:18:41 +00:00
Diego Pettenò
dc771f6b5f Remove some format string warnings.
patch by Diego Pettenò, flameeyes gmail com

Originally committed as revision 15461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-29 07:15:49 +00:00
Michael Niedermayer
df1a4b1134 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
2008-09-28 19:33:19 +00:00
Baptiste Coudurier
637b638e1e only write trailer when state says so, should fix issue #646
Originally committed as revision 15398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 17:11:46 +00:00
Baptiste Coudurier
31296f6eec add missing html start tag to ffserver status html page
Originally committed as revision 15241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 05:05:10 +00:00
Baptiste Coudurier
a3aa4fed62 cleanup, merge snprintf calls
Originally committed as revision 15240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 04:56:44 +00:00
Baptiste Coudurier
a7f361eb13 100l, compute correctly poll_table size when allocating
Originally committed as revision 15238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 04:16:05 +00:00
Stefano Sabatini
4af92de6f6 Make the nb_max_connections and nb_connections int variables unsigned.
Originally committed as revision 15191 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 20:10:32 +00:00
Stefano Sabatini
1c9ff17920 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
2008-09-03 18:16:34 +00:00
Aurelien Jacobs
ea452b54f0 strcasecmp() requires #include <strings.h>
Originally committed as revision 14728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 17:22:53 +00:00
Aurelien Jacobs
29d3ed3be6 ffserver: SA_RESTART and unsetenv require _XOPEN_SOURCE
Originally committed as revision 14724 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 10:03:20 +00:00
Diego Biurrun
e16190fa7a cosmetics: typo fixes
Originally committed as revision 14376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 21:12:37 +00:00
Baptiste Coudurier
59e7894c3d 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
2008-07-16 03:21:23 +00:00