har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,824 Commits 2 Branches 401 Tags
Commit Graph

494 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