virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
78,220 Commits 37 Branches 400 Tags 462 MiB
b552f3afa2
Commit Graph

644 Commits

Author SHA1 Message Date
Martin Storsjö
c5c6e67c28 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
 2010-03-08 09:03:25 +00:00
Måns Rullgård
ffabdaa14a ffserver: remove bogus comment 
Originally committed as revision 22303 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 00:26:54 +00:00
Måns Rullgård
6580d5e377 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
 2010-03-07 22:18:37 +00:00
Måns Rullgård
acd0026c0b 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
 2010-03-07 22:18:30 +00:00
Måns Rullgård
fd7bec5e3c ffserver: use av_stristr() 
Originally committed as revision 22252 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 19:41:24 +00:00
Ronald S. Bultje
19c8c4ecf4 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
 2010-03-03 18:41:50 +00:00
Ronald S. Bultje
3307e6ea86 Prefix non-static RTSP functions with ff_. 
Originally committed as revision 21974 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 00:35:50 +00:00
Diego Biurrun
7f6a384a4f Mark http_log() as static; it is only used in this file. 
Originally committed as revision 21017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-04 17:55:52 +00:00
Stefano Sabatini
aa13b573b4 Use av_match_ext() in place of the deprecated match_ext() function. 
Originally committed as revision 21000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 23:56:09 +00:00
Stefano Sabatini
0f52ef1a00 Use av_guess_format() in place of the deprecated guess_format(). 
Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 12:58:03 +00:00
Stefano Sabatini
1642ee4337 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
for the ASF muxer), and has no use outside ffserver.c.

Originally committed as revision 20987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-31 14:12:58 +00:00
Stefano Sabatini
992f8eaee7 Factorize common commandline options definition. 
Originally committed as revision 20664 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 23:12:19 +00:00
Michael Niedermayer
8447f0bd74 Split show_formats(). 
Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-19 16:35:55 +00:00
Stefano Sabatini
43d160fd00 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.

Originally committed as revision 20149 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 19:06:27 +00:00
Diego Biurrun
a392f82a3a Remove disabled code cruft. 
Originally committed as revision 20087 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 21:08:33 +00:00
Stefano Sabatini
7087a0f525 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
 2009-09-26 23:30:41 +00:00
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
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
Alex Beregszaszi
5400e0923a if feeder is disconnected, clear the feed registration, thus a new feeder can connect 
Originally committed as revision 8072 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-22 13:27:39 +00:00
Alex Beregszaszi
038a1243a2 codec_tag settable via VideoTag, and transmit codec_tag in ffm 
Originally committed as revision 8071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-22 13:23:38 +00:00
Alex Beregszaszi
c60202dffe change write/read to send/recv on socket operations 
Originally committed as revision 8069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-22 12:38:37 +00:00
Alex Beregszaszi
d96633bbe4 change close() to closesocket() on sockets (compatible with libavformat) 
Originally committed as revision 8068 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-22 12:17:25 +00:00
Alex Beregszaszi
8cba6ba97a remove gettime_ms and use av_gettime instead of it 
Originally committed as revision 8052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-21 14:06:03 +00:00
Alex Beregszaszi
1df93ae910 use av_random instead random/srandom 
Originally committed as revision 8051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-21 13:50:32 +00:00
François Revol
b0c858d834 poll() emulation for BeOS, and maybe MinGW. 
Originally committed as revision 7987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-15 07:44:10 +00:00
Måns Rullgård
18b67ae59e rename HAVE_DLFCN to HAVE_DLFCN_H 
Originally committed as revision 7078 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 23:53:37 +00:00
Måns Rullgård
78e61cc5c6 rename CONFIG_HAVE_DLFCN and CONFIG_HAVE_DLOPEN to HAVE_DLFCN/HAVE_DLOPEN 
Originally committed as revision 7018 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-13 23:14:24 +00:00
Steve L'Homme
949b1a13bf Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts. 
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-01 22:39:58 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Diego Biurrun
3e66a74072 Update copyright year and mention other copyright holders. 
Originally committed as revision 6408 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-01 17:26:15 +00:00
Måns Rullgård
d2a067d1d9 give AVInput/OutputFormat structs consistent names 
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-09 23:40:53 +00:00
Diego Biurrun
f1cc88a5d6 Use Subversion revision for FFMPEG_VERSION. 
based on a patch by Ismail Dönmez ismail$$at$$pardus$$dot$$org$$dot$$tr

Originally committed as revision 5502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-20 10:24:08 +00:00
Stefan Huehner
7b49ce2e34 Add const to (mostly) char* and make some functions static, which aren't used 
outside their declaring source file and which have no corresponding prototype.
patch by Stefan Huehner stefan^^@^^huehner^^.^^org

Originally committed as revision 5497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-18 11:33:14 +00:00
Aurelien Jacobs
267b0e5754 Update ffserver regression tests: 
- really produce readable files (instead of 0 byte files or headers only)
 - use bitexact, fastint dct, simple idct and qscale
 - gives consistent results across several archs
 - still fails on altivec ppc

Originally committed as revision 5129 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-09 00:36:39 +00:00
Alex Beregszaszi
33f5e2ec3e make those nasty variables static, also fix a html bug 
Originally committed as revision 5044 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-21 21:15:19 +00:00
Måns Rullgård
b2b77b9c23 remove unused function get_longterm_datarate() 
Originally committed as revision 4928 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-02 20:11:09 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Måns Rullgård
4733abcbf3 use PRIxN, %zd, %td formats where needed 
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-12 01:56:46 +00:00
Alex Beregszaszi
6b0bdc754b support for unlimited feed size 
Originally committed as revision 4697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-11-13 03:26:43 +00:00
Alex Beregszaszi
90f9c440e8 debug the launch commandline and new connections 
Originally committed as revision 4695 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-11-13 03:12:14 +00:00
Alex Beregszaszi
ac6a655b8a Make Launch more appropriate with support for full paths for the ffmpeg binary 
Originally committed as revision 4693 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-11-13 01:45:13 +00:00
Alex Beregszaszi
4b4f38e42e Support Launch when BindAddress is not INADDR_ANY or localhost. Also fix a possible buffer overflow 
Originally committed as revision 4692 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-11-13 01:41:01 +00:00
Alex Beregszaszi
edfdd7986d 10l, dont make bandwidth statistics negative when feed stops being sent (it was decreased every time feed sending was aborted) 
Originally committed as revision 4642 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-10-14 17:29:00 +00:00
Michael Niedermayer
8d931070fc ffserver segfault & other fatal failure fixes 
Originally committed as revision 4454 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-18 09:02:58 +00:00
Michael Niedermayer
01f4895c68 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility 
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-17 22:24:36 +00:00
Philip Gladstone
e8d27bc302 Turn on the seeking support for ffm streams. Now means that streams are 
played from the current time rahter than from the beginning

Originally committed as revision 4194 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-07 00:56:05 +00:00
Philip Gladstone
291fe90ae8 Fill out some mandatory fields in the Codec structure. Also add fields in 
the configuration to allow you to set Debug and Strict values.

Originally committed as revision 4185 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-06 03:21:04 +00:00
Michael Niedermayer
c0df9d75bd switch to native time bases 
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-30 21:43:59 +00:00
Philip Gladstone
7c054ea7e2 ffserver now runs again (sort of). 
* In the test cases, the swf, asf, jpg file formats all work
* The avi case doesn't play in winamp. I suspect that the duration field
  of zero confuses it
* The RM doesn't play. This always was pretty flaky.

Originally committed as revision 3795 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-03 02:42:02 +00:00
Petr Doubek
6ba5cbc699 HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>) 
tested and submitted by (Torsten Spindler <spindler at hbt dot arch dot ethz dot ch>)

Originally committed as revision 3381 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-08-12 00:09:32 +00:00
Michael Niedermayer
668fe04e39 min rate should be 0 by default 
Originally committed as revision 3362 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-28 10:24:38 +00:00
Michael Niedermayer
53e2f9caf8 ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>) 
Originally committed as revision 3340 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-25 11:59:34 +00:00
Michael Niedermayer
e928649b0b pass AVPacket into av_write_frame() 
fixes the random dts/pts during encoding
asf preroll fix
no more initial zero frames for b frame encoding
mpeg-es dts during demuxing fixed
.ffm timestamp scale fixed, ffm is still broken though

Originally committed as revision 3168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-29 02:06:32 +00:00
Roman Shaposhnik
4568325a18 * making it possible to specify recording date and time in a stream 
Originally committed as revision 2971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-06 06:31:12 +00:00
Falk Hüffner
7906085fcc warning patrol 
Originally committed as revision 2925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-24 23:32:48 +00:00
Michel Bardiaux
bc874daea8 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>) 
Originally committed as revision 2840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-03 15:41:21 +00:00
Henning Haaland Kulander
46026f4e5b VideoBufferSize option patch by ("Henning Haaland Kulander" <hennikul at ifi dot uio dot no>) 
Originally committed as revision 2749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-05 17:47:24 +00:00
Philip Gladstone
d445a7e9cc Changed a bunch of calls to sprintf to snprintf to protect against buffer 
overflows.

Fix streaming from non-streaming ffm files. It turned out that you
always got 'index & id do not match' errors.

Add some more error detection on getting FFM feeds

Originally committed as revision 2523 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-19 02:23:17 +00:00
Fabrice Bellard
e240a0bbe0 simpler bandwidth allocation for RTSP streaming - use av_read_frame() - initial support for raw MPEG2 transport stream streaming using RTSP 
Originally committed as revision 2506 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-10 19:02:56 +00:00
Philip Gladstone
8bc80f8b24 Minor bugfix to prevent segfault if a malloc fails. I have no idea what 
will happen, but at least this crash is gone.

Originally committed as revision 2307 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-27 01:23:40 +00:00
Fabrice Bellard
7b7d86f120 simplified version handling 
Originally committed as revision 2264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-11 22:51:05 +00:00
Fabrice Bellard
33f25681ae removed ctype.h 
Originally committed as revision 2234 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-08 22:13:17 +00:00
Fabrice Bellard
02d504a7d3 more sections in help - copyright fixes 
Originally committed as revision 2143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-08-24 15:29:48 +00:00
Michael Niedermayer
7d1c3fc1d6 rate distortion mb decision support 
fix decoding of old %16!=0 divx
fix assertion failure in motion_est.c

Originally committed as revision 2094 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-29 02:09:12 +00:00
Fabrice Bellard
bc3513865a added RTP/TCP protocol support 
Originally committed as revision 2063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-17 10:31:23 +00:00
Giancarlo Formicuccia
1bc1cfdddf - Gracefully handle the case where not all the streams are requested/wanted 
from the client. Simply ignore the unwanted/unasked streams.
- Don't need to pool() for every input character! (the socket is nonblocking,
so the loop is ok).
- Partially resurrect compute_send_delay for avoiding udp flood. Without a
similar patch, udp transmission is seriously unreliable.
(note that we don't link to a specific input reference stream, it's not needed
as the pts values should be coherent anyway. Also, non-monotonic pts
progression is unimportant in the long term).
- rtsp_cmd_pause must reset the time reference
patch by (Giancarlo Formicuccia <ilsensine at inwind dot it>)

Originally committed as revision 2034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-11 22:30:12 +00:00
Michael Niedermayer
17705a3420 Missing ffserver.c format parameter fix by (Giancarlo Formicuccia <ilsensine at inwind dot it>) 
Originally committed as revision 2005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-03 22:56:54 +00:00
Michael Niedermayer
1b52b6bd6b segfault fix by (Giancarlo Formicuccia <ilsensine at inwind dot it>) 
Originally committed as revision 2003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-03 21:09:06 +00:00
Giancarlo Formicuccia
94d9ad5f80 *** fix for read() 
Reading 1-char per read() is the less intrusive way to fix the behaviour I observed.
Not a nice fix, but the client requests shouldn't steal so much bandwidth
*** fix for find_rtp_session_with_url.
Note that mplayer send one PLAY request per stream, I don't know if this should be handled
more gracefully
patch by (Giancarlo Formicuccia <ilsensine at inwind dot it>)

Originally committed as revision 1998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-29 01:25:41 +00:00
Philip Gladstone
03ff071af9 Fix a horrible bug with the launch keyword not handling arguments of length 1! 
Originally committed as revision 1761 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-12 03:03:26 +00:00
Philip Gladstone
f0ef624057 Applied Roumen Petrov patch to fix crash/memory leak 
Originally committed as revision 1758 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-12 02:27:54 +00:00
Roman Shaposhnik
a7beab731d bunch of small thing patch by (Roman Shaposhnick <rvs at sun dot com>) 
Originally committed as revision 1753 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-11 09:43:05 +00:00
Philip Gladstone
e322ea480b * Add Video4MotionVector in a stream description to behave like the -4mv flag 
* Add ReadOnlyFile which behaves like File, but does not permit changing of the
  file. This can be used to prevent deleting of saved ffm files.

Originally committed as revision 1743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-09 02:16:01 +00:00
Andriy Rysin
0df65975ba RTSP "OPTIONS" command patch by (Andriy Rysin <arysin at bcsii dot net>) 
Originally committed as revision 1728 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-04 13:29:58 +00:00
Mark Hills
b88ba82315 ffserver deallocate ctx->streams on closing patch by (Mark Hills <mark at pogo dot org dot uk>) 
Originally committed as revision 1704 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-26 10:30:08 +00:00
Michael Niedermayer
14bea432f1 per context frame_rate_base, this should finally fix frame_rate related av sync issues 
Originally committed as revision 1666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-12 15:16:19 +00:00
Alex Beregszaszi
ce2749d2c4 simplified 
Originally committed as revision 1655 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-09 16:07:19 +00:00
Philip Gladstone
87638494ca Try to eliminate memory leak on stream termination. It doesn't crash, but I'm 
not sure if it fixes the problem.

Originally committed as revision 1620 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-04 03:12:32 +00:00
Philip Gladstone
cb275dd9eb This should fix the negative bandwidth in use in ffserver. Turned out that 
when WMP reports in, then we didn't increment the bandwidth, but we did
decrement it.

Originally committed as revision 1619 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-04 02:56:51 +00:00
Philip Gladstone
efa04ce296 Make ACLs work correctly for streams. Try comparing the addresses in 
host order rather than network order.

Originally committed as revision 1597 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-23 20:35:47 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t 
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-11 16:35:48 +00:00
Zdenek Kabelac
b29f97d136 * static,const,compiler warning cleanup 
Originally committed as revision 1571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-10 09:44:47 +00:00
Roman Shaposhnik
98486a6bc0 zero sized malloc patch by Roman Shaposhnick 
Originally committed as revision 1501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-01-23 22:00:57 +00:00
Fabrice Bellard
3c27199b8f added av_set_parameters() 
Originally committed as revision 1441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-01-11 05:14:28 +00:00
Philip Gladstone
b17d099db4 Improve bind failure message to indicate the port that failed 
Originally committed as revision 1399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-01-05 23:09:01 +00:00
Philip Gladstone
001bcd2955 Fix a crash in ffserver when streaming to WMP from a file. However, it 
still doesn't seem to work for me anyway.

Originally committed as revision 1391 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-01-03 20:00:49 +00:00
Philip Gladstone
c2ce254cab Make asf files work again -- the match against the URL was being done incorrectly. 
Originally committed as revision 1353 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-21 02:41:22 +00:00
Ryutaroh Matsumoto
c6c11cb6c6 mimetype fixes patch by (Ryutaroh Matsumoto <ryutaroh at it dot ss dot titech dot ac dot jp>) 
Originally committed as revision 1352 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-20 23:10:58 +00:00
Philip Gladstone
a4d70941cd * Try and fix the crashes in ffserver associated with the coded_frame stuff. 
This code is wrong, but it is not obvious what the right code is.
* Make sure that we reset SIGPIPE before execing ffmpeg.

Originally committed as revision 1330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-11 03:16:51 +00:00
Michael Niedermayer
492cd3a920 AVVideoFrame -> AVFrame 
Originally committed as revision 1327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-09 12:03:43 +00:00
Michael Niedermayer
1e491e29c2 cleanup 
adding AVVideoFrame
 moving quality, pict_type, key_frame, qscale_table, ... to AVVideoFrame
 removing obsolete variables in AVCodecContext
 skiping of MBs in b frames
 correctly initalizing AVCodecContext
 picture buffer cleanup

Originally committed as revision 1302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-04 10:04:03 +00:00
Philip Gladstone
6638d424d4 Try to make this compile on platforms with dlfcn.h 
Originally committed as revision 1296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-30 17:18:59 +00:00
Philip Gladstone
9c938e77e8 More fixes to compile and build on more platforms. 
Originally committed as revision 1280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-26 05:01:36 +00:00
Fabrice Bellard
0fa45e19ce minimum handling for mpeg4 video multicast from avi files 
Originally committed as revision 1262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-20 20:49:47 +00:00
Fabrice Bellard
6edd6884b5 RTP multicast begins to work in MPEG1 - simplified stream bandwidth computation (no need to recompute it at each request) 
Originally committed as revision 1260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-20 18:05:45 +00:00
Fabrice Bellard
829ac53d98 clean up of redirector code - first stage of RTP multicast support - added SDP redirector output for multicast 
Originally committed as revision 1257 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-20 15:00:05 +00:00
Zdenek Kabelac
5844544064 * const warning fix 
Originally committed as revision 1210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-14 19:07:25 +00:00
Michael Niedermayer
b8a78f419d reversing header game 
MIN/MAX -> FFMIN/FFMAX

Originally committed as revision 1184 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-10 11:46:59 +00:00
François Revol
9eb826478c MIN/MAX sys/param.h patch by (François Revol <revol at free dot fr>) 
Originally committed as revision 1164 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-05 00:56:08 +00:00
Philip Gladstone
d6562d2cfa Added VideoBitRateRange and VideoBitRAteTolerance settings 
Also made the Launch directive work again if you invoke ffserver with a relative
path.

Originally committed as revision 1111 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-10-30 02:15:07 +00:00
Fabrice Bellard
90dca1411d changed write_packet API - should work as before 
Originally committed as revision 1060 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-10-21 17:44:43 +00:00
D Richard Felker III
6b10e6e48c new ffserver options patch by (D Richard Felker III <dalias at aerifal dot cx>) 
Originally committed as revision 1057 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-10-21 16:08:39 +00:00
Michael Niedermayer
b3a391e8b8 fixing i_quant_factor, this should finally fix the bitrate bug with ffserver hopefully 
Originally committed as revision 959 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-09-19 20:22:39 +00:00
Philip Gladstone
a782f209df * Add code to pace sending a stream when it is being sent from a file. 
We limit the datarate to twice the average datarate (however the first
  few seconds are sent flat out to help with prebuffering).
* Add the initialization of the rc_eq fields and the like for VIDEO codecs.
* Add the missing get_arg calls for VideoQxxxx

Originally committed as revision 920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-09-12 02:31:11 +00:00
Mark Hills
81e0d0b412 oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>) 
Originally committed as revision 896 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-09-01 18:07:56 +00:00
Philip Gladstone
59eb2ed1f3 * Now we do not delete the feed file if it was created with the same 
parameters as the currently desired codec settings. Thus it is
  important not to fiddle with the streams if you want to keep the
  old data.
* Fix it so that the ?buffer= paramter can be larger than 40 minutes or
  so. Why is this good? So I can use ?buffer=43200 and get video from
  12 hours ago (i.e. when it is daylight outside)

Originally committed as revision 829 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-07-28 04:19:46 +00:00
Philip Gladstone
f853bb1128 * Removed a debug printf 
* Fix the sense of the test for "-" with customlog and not closing stdout in daemon mode

Originally committed as revision 828 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-07-27 15:22:17 +00:00
Philip Gladstone
8256c0a341 * Make asf streaming work again. Now uses the output format asf_stream. 
* Add ip address based acls for streams. I recommend adding ACL entries
  for all feeds to control who can submit stuff. You might also want to
  consider who can get to your status page.
* Make logging work again if customlog == "-"

Originally committed as revision 821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-07-27 03:03:04 +00:00
Fabrice Bellard
2effd27446 added RTSP and RTP server support - added daemon mode as default (use -d for foreground mode) - added module support 
Originally committed as revision 812 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-07-25 16:48:44 +00:00
Fabrice Bellard
2c4ae653af renamed gettime() av_gettime() - same for register_all() 
Originally committed as revision 808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-07-25 16:07:39 +00:00
Philip Gladstone
5eb765ef34 * Add code to restart ffmpeg if it crashes 
* Add code to monitor the actual datarates on the http connections
* Fix problem when ffmpeg uses more than 24 hours of CPU (display only problem)

Originally committed as revision 680 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-06-10 02:44:36 +00:00
Philip Gladstone
2ac887bae9 * Give the max stream time configuration item a chance of working 
* Add parameters to set author/comment/copyright/title to streamed asf
* Format the stats output a little bit better.

Originally committed as revision 663 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-06-05 02:17:06 +00:00
Philip Gladstone
31def22984 * Bad buffer management bug. Forgot to take care of the case 
where doubling the size of the buffer is not enough.

Originally committed as revision 633 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-30 20:37:51 +00:00
Philip Gladstone
cde25790ec * New stuff and bug fixes: 
* Change to dynamically allocated buffers. Should reduce memory footprint significantly
  as well as eliminate a call to av_abort!
* Better version of WMP rate switching infrastructure. Currently turned off till
  the PTS fixes are in.
* Added a Redirect type feature. This allows URLs served by ffserver to just
  redirect to somewhere else. You might want to do this. Really this needs to
  be enhanced -- say to handle all 404 pages.
* Add mechanism to automatically fire up ffmpeg on ffserver start. This is turned
  on by adding the Launch keyword to the <feed> definition.
* Add logic to take care of non-wmp user agents requesting .asf files. They now get
  a [reference] file with an appropriate mime type. This fixes the mplayer problem.
* Make sure that we have a large buffer for the stats page.
* Add a FaviconURL keyword to the status stream definition. If set, then it
  generates the appropriate HTML so that IE and Mozilla will display the favicon
  as appropriate. OK -- this is a pretty random feature.
* If the ffmpeg is running as a child of ffserver, then report it's CPU usage
  on the status page. [This is linux only -- maybe somebody could do the work for
  another OS. The tricky thing is getting the 'ps' command right.]

Originally committed as revision 630 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-30 02:49:07 +00:00
Philip Gladstone
3120d2a265 * Add first cut of code to handle Windows Media Player rate switching 
requests. The current state is that at startup, WMP will get the
  best stream that it can handle. However, subsequent rate switching
  only puts a message in the log saying what the new stream ought to
  be. Solving this will be tricky. I guess that we would have to wait for
  key frames to appear in the new stream, and then switch over to it.
  Some care would be needed to deal with the PTS of the new stream
  versus the old stream.

Originally committed as revision 602 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-26 03:36:34 +00:00
Fabrice Bellard
773a21b8fe license/copyright change - fixed header mess 
Originally committed as revision 588 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-25 22:26:19 +00:00
Philip Gladstone
b582f314f7 * Added yet more output to the status page to try and track down a problem 
Originally committed as revision 579 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-24 02:06:15 +00:00
Philip Gladstone
ec3b22326d * Add support for time-limiting a live stream. (Some guy streamed one of 
my pondcam streams for 24 hours! I'll bet he wasn't watching.
* Add code to allocate the priv_data so that the ffm header can be
  parsed again. [Fix crash]

Originally committed as revision 577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-24 01:18:19 +00:00
Fabrice Bellard
bd7cf6ad3a use new api (NOT TESTED) - suppressed strlcpy 
Originally committed as revision 549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-20 16:33:46 +00:00
Philip Gladstone
2e04edb36e Fix a segfault when handling errors or .asx or .ram files. Silly bug 
on my part.

Originally committed as revision 536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-20 03:02:09 +00:00
Fabrice Bellard
0f1578afcc use av memory functions 
Originally committed as revision 531 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-18 23:17:41 +00:00
Philip Gladstone
a6e14edde0 * If a stream gets stuck in WAIT_FEED, then disconnecting the other end 
will clear out the stream. I think that this is really a linux bug in
  the handling of poll, but I did a workaround anyway.
* Improve the statistics output and prevent a buffer overrun when lots
  of clients are connected.
* Process ffm input when it is received and don't always be one ffm
  packet behind.
* Try to avoid going through the poll loop when not required.

Originally committed as revision 514 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-18 21:33:05 +00:00
Philip Gladstone
79c4ea3c6c * Change the default behaviour to start streaming as soon as possible (i.e. 
no waiting for key frames).
* Provide StartSendOnKey paramter for a stream to wait until we get key frames
  before sending.
* Add the codec names into the status page. May help debugging problems.

Originally committed as revision 507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-17 01:53:28 +00:00
Philip Gladstone
42a63c6a02 * Add code to configure the following: 
* prebuffering/preroll a live stream -- this improves startup time
  * videoqmin/videoqmax/videoqdiff -- codec parameters
  * maximum bandwidth for live streams
* Add support for .ram and .rpm extensions mapping onto .rm
* Make the status page show bandwidth. Also make the .asf and .rm
  links go to .asx and .ram files.
* Make a stream only start streaming when it gets a keyframe on each
  stream. This is arguable, and it maybe ought to be restricted to
  live streams. However, since I don't think that file streams work,
  this is a step in the right direction. It improves the startup delay.
* Log an error if we are unable to delete the temp feed file.

Originally committed as revision 501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-16 02:03:07 +00:00
Philip Gladstone
7434ba6d53 * Improve logging -- now actually gives you the number of bytes sent 
* Print out the logging information that comes from WMP (you'd be suprised what
  it sends!
* Fix a remotely exploitable buffer overflow (argh!)
* Add support for automatically serving up .asx files. It generates an automatic
  redirect to the associated .asf file (with the same parameters). I guess that
  someone who understands the realaudio equivalent could hack that it as well.

Originally committed as revision 482 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-10 02:20:27 +00:00
Juanjo
e7f9c67417 - HQ option for ffserver. Thanks to D Richard Felker III. 
Originally committed as revision 478 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-09 07:43:07 +00:00
Juanjo
ba9b374f89 - Changed default qmin = 3 as ffmpeg.c 
- Less bitrate tolerance since we are streaming.

Originally committed as revision 474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-09 02:33:27 +00:00
Philip Gladstone
f747e6d343 * Fix a nasty problem with output buffering not have enough (or large enough) 
buffers. In fact, the code was pretty much shot.
* Try to fool WMP into thinking that we are a microsoft server.
* When we establish a stream to a user, copy the codec information from
  that saved as part of the stream. This gives us the real frame_size and
  other important parameters.
* ASF needs to know about key frames, so add some logic to copy this information
  around.
* When we get the data from ffmpeg as part of a feed, make sure that we save
  the actual codec parameters.
* Allow configuration of AudioCodec and VideoCodec
* Make sure that we delete the feed file before starting. This is not ideal
  but it makes things work a whole lot better!

Originally committed as revision 454 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-09 01:11:08 +00:00
Juanjo
10bb7023a2 - Added force_pts to av_write_packet() to be able to force PTS, this helps 
(and fix) stream copying. By now force_pts it's just honoured by the MPEG
muxer. ASF could honour this also, but it should be fixed to use Tickers
first.
- MPEG audio decoder exports it's frame size in bytes.
- Hope this fix the floating point exception found in ffserver.

Originally committed as revision 382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-04-07 21:44:29 +00:00
Michael Niedermayer
68d7eef971 trying to fix qscale==0 
Originally committed as revision 341 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-03-19 04:31:10 +00:00
Michael Niedermayer
f5d1f41b11 fixing warning 
Originally committed as revision 315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-02-26 23:11:08 +00:00
Zdenek Kabelac
608d0dee6f * Also include time.h for nanosleep() 
by:  Philipp Matthias Hahn <pmhahn@titan.lahn.de>

Originally committed as revision 309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-02-18 10:20:03 +00:00
Michael Niedermayer
d8cf5aea49 optimized the normal bitstream writer, its faster than the alternative one on p3 now ... lets hope its at least not slower on p4 & k7 
Originally committed as revision 299 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-02-15 00:14:01 +00:00
Fabrice Bellard
63bdb086b1 fixed prototype change 
Originally committed as revision 150 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-09-25 18:27:53 +00:00
Fabrice Bellard
dd2af5aa4e jpeg hack 
Originally committed as revision 89 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-08-15 13:03:37 +00:00
Fabrice Bellard
85f07f223d merge 
Originally committed as revision 6 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-07-22 14:37:44 +00:00
Fabrice Bellard
1b58d58dda removing old files 
Originally committed as revision 4 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-07-19 20:46:37 +00:00
Fabrice Bellard
9aeeeb63f7 Initial revision 
Originally committed as revision 2 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2000-12-20 00:02:47 +00:00