1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

472 Commits

Author SHA1 Message Date
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
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
Baptiste Coudurier
250be719e4 fix source stream, source_index is refering to fmt_in, needs testing
Originally committed as revision 13902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 03:16:24 +00:00
Baptiste Coudurier
d80904cc87 simplify
Originally committed as revision 13901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 02:41:06 +00:00
Baptiste Coudurier
e21ac20921 no need to print date anymore since done in http_log
Originally committed as revision 13900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 02:16:00 +00:00
Baptiste Coudurier
3d9cc27df8 move code setting output parameters after possible failure
Originally committed as revision 13876 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 03:42:23 +00:00
Baptiste Coudurier
697efa36c7 move code after possible failure, so no need to free
Originally committed as revision 13875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 03:30:53 +00:00
Baptiste Coudurier
e6f0deab80 check av_open_input_stream error
Originally committed as revision 13874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 03:25:20 +00:00
Baptiste Coudurier
fbc6314428 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
2008-06-22 03:20:28 +00:00
Baptiste Coudurier
86771c6804 free pb
Originally committed as revision 13872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 02:34:33 +00:00
Baptiste Coudurier
f2972c8c82 use av_open_input_stream
Originally committed as revision 13871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 02:31:57 +00:00
Baptiste Coudurier
381ec67749 do not allocate st->codec, it will be overwritten later; fix memleak
Originally committed as revision 13870 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 02:15:13 +00:00
Baptiste Coudurier
0b459fb2d8 log to stderr
Originally committed as revision 13867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 01:31:37 +00:00
Baptiste Coudurier
bcd3ce5903 add callback for av_log
Originally committed as revision 13866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 01:30:41 +00:00
Baptiste Coudurier
82e0be62ef no need to print date anymore since done in http_log
Originally committed as revision 13865 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 01:13:33 +00:00
Baptiste Coudurier
9fd3442f63 use ctime1
Originally committed as revision 13864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 01:12:39 +00:00
Baptiste Coudurier
124ed1c073 print date in http_log
Originally committed as revision 13863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 01:08:48 +00:00
Baptiste Coudurier
fa288df453 remove useless init
Originally committed as revision 13862 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 00:55:23 +00:00
Baptiste Coudurier
f69bb0cc1c merge declaration and init
Originally committed as revision 13861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 00:54:25 +00:00
Baptiste Coudurier
2b9cd1e78a reindent
Originally committed as revision 13860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 00:53:28 +00:00
Baptiste Coudurier
d2a1ea1d9b http or rtsp only support
Originally committed as revision 13859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 00:52:22 +00:00
Baptiste Coudurier
3296409d5c fix open return check
Originally committed as revision 13858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 00:33:08 +00:00
Erik Hovland
0679719d5b fix feed_filename test, field is char [1024], patch by Erik Hovland, erik at hovland dot org
Originally committed as revision 13857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 00:30:48 +00:00
Baptiste Coudurier
60a04f7fc9 use av_seek_frame to flush demxu pending packets, fixes seeking, should have been done when av_find_stream_info was added
Originally committed as revision 13855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 00:22:21 +00:00
Baptiste Coudurier
f8b06be970 free c->pb_buffer before overwriting it, fix memleak
Originally committed as revision 13853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-21 06:08:59 +00:00
Baptiste Coudurier
4f0a942bae return 1 when error during write frame, state changed
Originally committed as revision 13851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-21 03:55:25 +00:00
Baptiste Coudurier
8aae202e44 set default preload and max_delay for muxer to avoid mpeg ps muxer to spit many underflow errors, use ffmpeg default values
Originally committed as revision 13850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-21 03:43:16 +00:00
Baptiste Coudurier
177d256402 change bandwidth to unsigned
Originally committed as revision 13849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-21 03:38:49 +00:00
Baptiste Coudurier
794ac28c52 remove useless init, logfilename is static
Originally committed as revision 13848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-21 03:37:04 +00:00
Baptiste Coudurier
acae1492cf use http_log when log file is setup
Originally committed as revision 13847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-21 03:35:48 +00:00
Baptiste Coudurier
4e8f77ab61 always use stdout to log when running in debug mode
Originally committed as revision 13846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-21 03:34:18 +00:00
Baptiste Coudurier
b43bf8acf1 rescale duration when outputting packet
Originally committed as revision 13845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-21 03:32:37 +00:00
Baptiste Coudurier
050056d08c log accept error
Originally committed as revision 13844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-21 03:31:30 +00:00
Baptiste Coudurier
b4befb99c2 use http_log when log file is setup
Originally committed as revision 13843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-21 03:29:59 +00:00
Baptiste Coudurier
0dc17c21ec upgrade bandwidth config to use int64_t, raise limit
Originally committed as revision 13842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-21 03:26:24 +00:00
Baptiste Coudurier
1ad8289ede upgrade bandwidth to uint64_t
Originally committed as revision 13841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-21 03:23:51 +00:00
Baptiste Coudurier
9507a12e42 add static
Originally committed as revision 13840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-21 03:21:29 +00:00
Stefano Sabatini
dca2108541 Cosmetics: s/stats/status/ in ffserver.c.
Originally committed as revision 13809 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 07:10:44 +00:00
Baptiste Coudurier
7ab088648b add AVOption support in ffserver configuration file
Originally committed as revision 13719 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 00:25:33 +00:00
Stefano Sabatini
59c2959d07 use unsetenv, fix warning, patch by Stefano Sabatini, stefano dot sabatini-lala at poste dot it
Originally committed as revision 13707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 23:56:00 +00:00
Stefano Sabatini
17b01199f0 use program_name to be more consistent with the banner, patch by Stefano Sabatini, stefano dot sabatini-lala at poste dot it
Originally committed as revision 13706 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 23:49:26 +00:00
Baptiste Coudurier
2dae1dd0dd add \n to error message
Originally committed as revision 13592 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-01 02:01:22 +00:00
Baptiste Coudurier
180b7026b9 2nd try fix got_key_frame when video+audio
Originally committed as revision 13559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-30 17:53:50 +00:00
Baptiste Coudurier
78728064c3 fix got_key_frame when stream is audio
Originally committed as revision 13552 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-30 02:32:58 +00:00
Baptiste Coudurier
0332f54945 set got_key_frame when packet is video, fix first video packet with index 0 and 2 streams
Originally committed as revision 13551 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-30 02:26:07 +00:00
Baptiste Coudurier
3766ed7214 log error when writing frame to output
Originally committed as revision 13548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-30 01:46:57 +00:00
Baptiste Coudurier
c1593d0e56 wake up connections to stop waiting when feed is being closed
Originally committed as revision 13547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-30 01:46:06 +00:00
Baptiste Coudurier
084a891292 fix timestamps rescaling, index in source format might be different
Originally committed as revision 13546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-30 01:44:35 +00:00
Baptiste Coudurier
929a9b7544 log some errors
Originally committed as revision 13544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-30 00:50:39 +00:00
Baptiste Coudurier
58bd615ff5 set is_streamed before writing data to output file
Originally committed as revision 13543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-30 00:21:42 +00:00
Baptiste Coudurier
3b37167691 cosmetics, reindent
Originally committed as revision 13541 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 23:11:25 +00:00
Baptiste Coudurier
1cb4d12c72 cosmetics, move declaration where it is used, remove now useless block
Originally committed as revision 13540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 23:09:29 +00:00
Baptiste Coudurier
369074680e use av_parse_video_frame_rate
Originally committed as revision 13537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 17:24:22 +00:00
Diego Biurrun
1ab05d37ff Remove unnecessary #include.
Originally committed as revision 13532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 15:13:47 +00:00
Erik Hovland
f094b6627d Remove unnecessary header #includes.
Extracted from a patch by Erik Hovland, erik hovland org.

Originally committed as revision 13531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 13:40:43 +00:00
Stefano Sabatini
ea9c581f61 Simplify show_banner() so that it does not require arguments, similar
to what was previously done with show_version().
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 08:48:51 +00:00
Baptiste Coudurier
9667a2d268 reindent
Originally committed as revision 13525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 02:32:02 +00:00
Baptiste Coudurier
a9c1bb711b check that redirect is set, fixes CID13 RUN2
Originally committed as revision 13524 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 02:31:35 +00:00
Baptiste Coudurier
7e183a93d8 reindent
Originally committed as revision 13523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 02:29:33 +00:00
Baptiste Coudurier
ce651af2b2 check that stream is set, fixes CID13 RUN2
Originally committed as revision 13522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 02:28:33 +00:00
Baptiste Coudurier
5735f6dca0 check if stream has been set, fixes CID15 RUN2
Originally committed as revision 13521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 02:11:46 +00:00
Baptiste Coudurier
75480e86ba init h, fixes CID54 RUN2
Originally committed as revision 13520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 01:59:44 +00:00
Baptiste Coudurier
3fb53d55db remove dummy coded frame, no muxer should use it anyway
Originally committed as revision 13497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 17:04:45 +00:00
Baptiste Coudurier
c351cc7f57 better error message
Originally committed as revision 13370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 00:12:53 +00:00
Baptiste Coudurier
f61d45c99e better error message
Originally committed as revision 13272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 02:34:19 +00:00
Baptiste Coudurier
1692008f51 latest libavc svn requires at least this value for bit_rate_tolerance, not using av_q2d because of float
Originally committed as revision 13271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 02:19:46 +00:00
Stefano Sabatini
f346033e9d Add -formats option to ffserver.
Patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 13245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 07:14:28 +00:00
Stefano Sabatini
8117c97e12 Implement ffserver -version.
Patch by: Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-22 09:48:34 +00:00
Michael Niedermayer
20176cbc73 Get rid of more senseless wrapper functions and use OPT_EXIT instead.
Originally committed as revision 13233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 23:41:17 +00:00
Michael Niedermayer
64555bd9b1 Do not pass program_name as argument to show_version(), this allows some
future simplifications.

Originally committed as revision 13232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 23:36:32 +00:00
Baptiste Coudurier
c4355f4eaa open logfile in append mode, don't overwrite it
Originally committed as revision 13223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 20:56:22 +00:00
Baptiste Coudurier
8a0b55ff35 do not forget to free packet, fix memleak
Originally committed as revision 13222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 20:50:41 +00:00
Stefano Sabatini
5a635bc729 Make ffserver use parse_options().
Patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 13219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 17:55:54 +00:00
Stefano Sabatini
e6375662db cosmetics: Make 'ffserver -h' output consistent with other ff* tools.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-16 13:22:14 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Luca Abeni
f8cda19ee6 Include poll.h instead of sys/poll.h
Originally committed as revision 11924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 12:51:14 +00:00
Aurelien Jacobs
815f98cce4 non-const 2nd parameter for strtol/strtod
Originally committed as revision 11803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 00:54:37 +00:00
Diego Biurrun
8bfb108b3e comment typo fixes
Originally committed as revision 11294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-21 11:50:18 +00:00
Aurelien Jacobs
17e45b377c pb->buf_end is already set by url_open_buf()
Originally committed as revision 11277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-19 23:29:26 +00:00
Michael Niedermayer
562b216307 avoid using first_avcodec
Originally committed as revision 11205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-12 18:47:58 +00:00
Michael Niedermayer
90901860c2 stupid code (casting of void*) found by checktree.sh
Originally committed as revision 11117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-01 00:19:44 +00:00
Dave Yeo
93115b82f0 Add #include "os_support.h" to restore OS/2 support.
patch by Dave Yeo, daveryeo telus net

Originally committed as revision 11096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-27 11:42:09 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Luca Abeni
c971ff1977 Remove the inclusion of rtsp.h and rtp.h from avformat.h, and
explicitly include such headers where needed

Originally committed as revision 10871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-29 09:15:35 +00:00
Stefano Sabatini
8eb1c1cd5b Remove redundant banner output from ffserver.
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Date: Sat, 29 Sep 2007 13:45:12 +0200
Subject: [FFmpeg-devel] [PATCH] Remove redundant banner output from ffserver

Originally committed as revision 10629 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-30 04:09:10 +00:00
Stefano Sabatini
3578e9a072 Make ffserver show a banner at startup.
Patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 10607 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-28 15:09:06 +00:00
Stefano Sabatini
86074ed1b7 Implement common show version and banner.
Patch by Stefano Sabatini [stefano sabatini-lala poste it]

Originally committed as revision 10600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-27 06:38:40 +00:00
Stefano Sabatini
f94361612a Make parse_date return INT64_MIN in case of unparsable input.
Patch by Stefano Sabatini: [stefano sabatini-lala poste it]
Original thread:
[FFmpeg-devel] [PATCH] Enhace documentation forlibavformat/utils.c:parse_date
Date: 08/17/2007 09:40 PM

Originally committed as revision 10533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-19 12:38:07 +00:00
Luca Abeni
25e3e53d40 Fix an ffserver crash when a non-existing rtsp: url is requested
Originally committed as revision 10519 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-17 12:47:44 +00:00
Luca Abeni
9dc0bc3dad Use AVFMT_FLAG_GENPTS for the input file (the RTP output format needs all the
PTSs to be set)

Originally committed as revision 10514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-17 07:50:04 +00:00
Aurelien Jacobs
b156b88c13 rtp and rtsp demuxer declarations are not part of public API
Originally committed as revision 10474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-10 22:48:42 +00:00
Stefano Sabatini
4ce5df0856 Make ffserver use cmdutils.c show_license function
patch by Stefano Sabatini: [stefano sabatini minus lala ! poste it]

Originally committed as revision 10183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-22 13:10:25 +00:00
Luca Abeni
89da5781a1 Call av_find_stream_info() immediately after opening an input file.
Needed to avoid reading the same TS two times at the beginning of the
file (whic resulted in an "error, non monotone timestamps..." when
streaming RTP from a file)

Originally committed as revision 10148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-20 07:17:39 +00:00
Luca Abeni
dd7234725d Use avf_sdp_create() in ffserver
Originally committed as revision 10147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-20 07:07:20 +00:00
Stefano Sabatini
8838141268 Make ffserver -h exit 0.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 10103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-13 08:41:51 +00:00
Stefano Sabatini
5c14a7955e Make show-license exit 0.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 10070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-11 13:11:30 +00:00
Alex Beregszaszi
3cf9ea7f48 use proper closesocket defines
Originally committed as revision 9992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-08 20:25:32 +00:00
Alex Beregszaszi
611c574137 cosmetic: remove a huge number of useless braces
Originally committed as revision 9990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-08 19:40:37 +00:00
Alex Beregszaszi
2d563d2f8e cosmetic: simplify some constructs
Originally committed as revision 9989 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-08 19:23:40 +00:00
Alex Beregszaszi
0bd5396778 cosmetic: extra space
Originally committed as revision 9987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-08 19:04:23 +00:00
Alex Beregszaszi
33a4ecbe20 cosmetic: indentation
Originally committed as revision 9986 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-08 18:56:27 +00:00
Alex Beregszaszi
eeffbdea97 cosmetic: remove extra parenthesis
Originally committed as revision 9985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-08 18:55:49 +00:00
Alex Beregszaszi
af0f371246 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
2007-07-13 00:55:42 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 10:40:25 +00:00
Ronald S. Bultje
0f4e816582 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
2007-07-02 07:43:23 +00:00
Måns Rullgård
f7d78f3654 replace the uses of old string functions that Reimar missed
Originally committed as revision 9406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-24 11:27:12 +00:00
Stefano Sabatini
b33ece1634 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
2007-06-18 08:08:43 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 09:29:25 +00:00
Diego Biurrun
364a960704 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
2007-06-10 14:34:56 +00:00
Alex Beregszaszi
ba472aaf01 implement ff_socket_nonblock and use it in networking code
Originally committed as revision 8846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-27 00:41:50 +00:00
Alex Beregszaszi
8da4034f52 use ff_neterrno() and FF_NETERROR() for networking error handling
Originally committed as revision 8845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-27 00:35:54 +00:00
Alex Beregszaszi
0bdacf29d4 use network.h instead network includes
Originally committed as revision 8844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-27 00:17:46 +00:00
Diego Biurrun
4ee10633d2 cosmetics: Remove trailing whitespace and tabs.
Originally committed as revision 8838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 19:27:32 +00:00
Alex Beregszaszi
2bd8416e7c use resolve_host in acl handlign too, simplificates the code
Originally committed as revision 8819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 22:23:38 +00:00
Alex Beregszaszi
1840587402 make the last globals static
Originally committed as revision 8818 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 22:22:19 +00:00
Alex Beregszaszi
ad8b8abce4 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
2007-04-25 21:05:47 +00:00
Luca Abeni
57dbe08b61 Fix ffserver crash when closing the second RTP session
Originally committed as revision 8799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-24 13:28:38 +00:00
Alex Beregszaszi
aabce53304 check ip port range from config
Originally committed as revision 8787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-22 18:06:08 +00:00
Alex Beregszaszi
5eb782f080 simplificate
Originally committed as revision 8786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-22 18:01:29 +00:00
Alex Beregszaszi
cb2abe3f4d use av_strdup instead malloc/strcpy
Originally committed as revision 8785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-22 17:56:26 +00:00
Alex Beregszaszi
d2040a8fb6 fixed InputFormat option, which was never working
Originally committed as revision 8784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-22 17:48:23 +00:00
Alex Beregszaszi
0aecfdf930 remove useless code, file removal is handled elsewhere
Originally committed as revision 8782 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-22 15:06:16 +00:00
Luca Abeni
b0b2faa709 Fix an use-after-free bug
Originally committed as revision 8759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-19 13:55:06 +00:00
Luca Abeni
2c6a5e6ccd Remove unused callbacks from ffserver
Originally committed as revision 8758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-19 13:54:11 +00:00
Luca Abeni
e8d658df34 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
2007-04-10 14:40:03 +00:00
Luca Abeni
7e665cd3ff 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
2007-04-10 14:36:11 +00:00
Stanislav Brabec
6308cacaf4 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
2007-03-31 16:36:56 +00:00
Alex Beregszaszi
087fa47507 fix x-octet-stream mime type
Originally committed as revision 8568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-31 14:39:04 +00:00
Alex Beregszaszi
65e7226147 use av_strdup
Originally committed as revision 8567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-31 14:36:24 +00:00
Alex Beregszaszi
55d07ba68e remove dead code
Originally committed as revision 8566 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-31 14:34:29 +00:00
Michael Niedermayer
c367d06702 prevent exit missuse
Originally committed as revision 8536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-27 21:47:03 +00:00
Panagiotis Issaris
750f0e1f8b 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
2007-03-12 14:17:26 +00:00
Alex Beregszaszi
acdc852017 print codec parameters for audio too
Originally committed as revision 8303 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-09 11:20:57 +00:00
Alex Beregszaszi
d0a5513b88 disconnect new feeder if feed is already being received
Originally committed as revision 8271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-06 13:29:04 +00:00
Alex Beregszaszi
bae79c048f 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
2007-02-24 03:17:59 +00:00
Alex Beregszaszi
c3f5818525 store internal timestamps in int64_t instead long
Originally committed as revision 8112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-24 02:39:57 +00:00
Alex Beregszaszi
f1debfd0bd rescale pts/dts for output format
Originally committed as revision 8111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-24 02:28:28 +00:00
Alex Beregszaszi
f75cdda718 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
2007-02-24 02:24:42 +00:00
Alex Beregszaszi
638831aacc disconnect client if trailer is sent
Originally committed as revision 8109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-24 02:16:12 +00:00