Commit Graph

309 Commits

Author SHA1 Message Date
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
Stefano Sabatini 7ac884c591 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
2008-07-09 21:51:40 +00:00
Baptiste Coudurier a9d9aa3613 revert r13867, - reference stdout, I was drunk
Originally committed as revision 13978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 19:55:00 +00:00
Baptiste Coudurier 80b616fca3 use http_log now that logfile is setup
Originally committed as revision 13975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 19:00:06 +00:00
Baptiste Coudurier f10d55ed88 move logfile setup right after config parsing
Originally committed as revision 13974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 18:51:54 +00:00
Baptiste Coudurier f0754ad822 remove useless init
Originally committed as revision 13973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 18:51:21 +00:00
Stefano Sabatini 8bf61f5ba9 Reindent.
Originally committed as revision 13956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 22:30:41 +00:00
Stefano Sabatini 5dc8eeb639 Make ffserver show launched commandlines not only in debug-mode.
Originally committed as revision 13955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 22:27:37 +00:00
Stefano Sabatini 6aada9b1ba 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
2008-06-24 21:35:27 +00:00
Stefano Sabatini 40444a59c1 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
2008-06-24 21:26:20 +00:00
Baptiste Coudurier 14c43f918f log when feed is already being received
Originally committed as revision 13939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 02:02:32 +00:00
Baptiste Coudurier 65f2f028ff reindent
Originally committed as revision 13938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 02:00:54 +00:00
Baptiste Coudurier cb51aef1ab copy extradata if present
Originally committed as revision 13913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 19:57:58 +00:00
Stefano Sabatini 496a613293 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
2008-06-23 19:43:38 +00:00
Baptiste Coudurier b06759549f fix segv, fmt_ctx is not set for rtsp
Originally committed as revision 13910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 17:57:31 +00:00
Baptiste Coudurier ace21da3cf cosmetics, braces placement
Originally committed as revision 13908 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 08:12:15 +00:00
Baptiste Coudurier 3ab29d8e4f 10l, do not use ctx before being set, fix segv
Originally committed as revision 13906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 07:28:49 +00:00
Baptiste Coudurier dc3a6a368c fix compilation, this should be better
Originally committed as revision 13905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 03:21:40 +00:00
Baptiste Coudurier 4def51fa59 10l, move init after possible goto
Originally committed as revision 13904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 03:18:55 +00:00
Baptiste Coudurier 8f56ccca92 simplify, use ist
Originally committed as revision 13903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 03:18:24 +00:00