generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
44,714 Commits 24 Branches 241 Tags 173 MiB
127b70e423
Commit Graph

477 Commits

Author SHA1 Message Date
Aurelien Jacobs
9389b925f1 ffserver: fix prepare_sdp_description() to dynamically allocate streams 
Originally committed as revision 25494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 19:09:05 +00:00
Stefano Sabatini
126b638ea0 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate() 
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.

This change also adds a linking-time dependency of libavcodec and of
libavfilter on libavcore.

Originally committed as revision 24518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 23:12:28 +00:00
Howard Chu
0aee2a57c8 Also use 503 for bandwidth limit exceeded 
Originally committed as revision 24107 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-08 09:21:24 +00:00
Howard Chu
2a22187f39 Fix "server too busy" status code 
Originally committed as revision 24105 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-08 08:59:53 +00:00
Måns Rullgård
f3bfe388b5 Make ff_url_split() public 
ff_url_split() is retained as an alias, as it was used by ffserver,
to avoid breaking ABI compatibility with it.

Originally committed as revision 23822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-27 14:16:46 +00:00
Martin Storsjö
5634f30c4a ffserver: Use avcodec_copy_context instead of manually copying an AVCodecContext 
Originally committed as revision 23692 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 06:45:05 +00:00
Howard Chu
d9aac26761 When reading a stream, should retry on EAGAIN instead of just failing. Also, 
when reading a live feed, should retry regardless of whether any client has
opened the stream.

Originally committed as revision 23621 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-16 01:12:26 +00:00
Howard Chu
8190f62f9b Support presets in ffserver.conf 
Originally committed as revision 23524 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-08 09:55:30 +00:00
Martin Storsjö
f475f35fdd ffserver: Calculate cur_pts using first_pts as origin instead of ist->start_time 
This fixes cases where ist->start_time wasn't initialized. This also makes
cur_pts calculated against the same origin for all streams.

Originally committed as revision 23450 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-03 20:58:22 +00:00
Martin Storsjö
3b963552bc ffserver: Allow floating point audio bit rates 
This allows setting bit rates that aren't an exact multiple of 1000.

Originally committed as revision 23419 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-02 07:09:44 +00:00
Martin Storsjö
577ee94871 ffserver: Send a Content-Base header in the reply to RTSP DESCRIBE requests 
This is needed for QuickTime Player to be able to connect properly.

Originally committed as revision 23325 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-25 19:23:18 +00:00
Martin Storsjö
111c935980 ffserver: Fix one of the codec parameter checks 
This is probably what was originally intended; the codec pointers are all NULL.

Fix by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-24 20:24:39 +00:00
Martin Storsjö
a5ba4cedf2 ffserver: Fix streaming with more than one stream 
Fix by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23294 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-24 20:08:02 +00:00
Howard Chu
e175b55edf ffserver: Fix extradata handling 
Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-24 19:59:18 +00:00
Martin Storsjö
c966c91279 ffserver: Fix an out of bounds read 
Fix by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23292 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-24 19:23:31 +00:00
Martin Storsjö
9cc9a15510 ffserver: Fix another memory leak 
Don't allocate st->codec, it will be overwritten by the memcpy a few
lines further down.

Fix by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-24 19:12:00 +00:00
Howard Chu
ea4f8aabab ffserver: Plug some memory leaks 
Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23290 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-24 19:05:22 +00:00
Martin Storsjö
576fb48e6d Make ff_random_get_seed public, rename to av_get_random_seed, export the header 
Keep an old ff_ named function for binary compatibility until the
next major bump.

Originally committed as revision 23254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-23 08:53:40 +00:00
Howard Chu
686d6f4022 ffserver: Avoid busylooping while reading non-blocking input 
Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-21 07:59:12 +00:00
Martin Storsjö
90c9210028 Cosmetics: reindent 
Originally committed as revision 23156 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 11:46:23 +00:00
Howard Chu
1bf5228eb6 ffserver: Don't set me_method unconditionally 
Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23155 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 11:45:09 +00:00
Howard Chu
0156fcf252 ffserver: Write proper GMT date/times in Date headers 
Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23154 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 11:16:12 +00:00
Martin Storsjö
43d09fafd4 ffserver: Make sure a destination URL is set when creating the SDP 
Debugged by Howard Chu, hyc at highlandsun dot com.

Originally committed as revision 23151 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-17 17:34:13 +00:00
Stefano Sabatini
2ef6c1242a Mark av_metadata_set() as deprecated, and use av_metadata_set2() 
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-25 14:27:42 +00:00
Stefano Sabatini
472e12f510 Implement ffserver.c:report_config_error() and a macro for logging 
error messages / updating the error count.

Originally committed as revision 22960 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-24 10:39:28 +00:00
Stefano Sabatini
6675a5bf73 Statically initialize ffserver.c:config_filename, simplify. 
Originally committed as revision 22959 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-24 10:39:25 +00:00
Luca Barbato
bacde6466c Make ffserver support rfc3550 
Originally committed as revision 22907 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-19 11:42:02 +00:00
Benjamin Larsson
58f48adb51 Add DynamicACL support for FFserver. 
Originally committed as revision 22815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-07 20:06:02 +00:00
Ronald S. Bultje
d9521cb119 Fix FFM-based streaming from ffmpeg to ffserver. The basic problem is that 
we'd memset() the codec context to zero, thereby setting audio input to U8
and video to YUV420P. For most video encoders, that actually works, but for
most audio codecs, it doesn't. This patch changes defaults to those set by
avcodec_context_get_defaults() and have ffmpeg figure out the optimal encoding
format itself if not set explicitely (as it does for the non-ffserver-cases
also).

Originally committed as revision 22751 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 21:02:34 +00:00
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY. 
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 12:29:58 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Martin Storsjö
2626308abb Actually parse the auth headers in RTSP 
Originally committed as revision 22677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 21:48:58 +00:00
Måns Rullgård
22f73dccad Move resolve_host() to ffserver.c 
This deprecated function is only used by ffserver, yet does not have
a prototype visible there.

In the long term, ffserver should be made IPv6-aware.  In the meantime,
this change removes cruft from lavf and fixes some warnings in ffserver.

Originally committed as revision 22329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 18:43:27 +00:00
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