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
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
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
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
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
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
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
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
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
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
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
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
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
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
90c9210028
Cosmetics: reindent
...
Originally committed as revision 23156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 11:46:23 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
8447f0bd74
Split show_formats().
...
Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-19 16:35:55 +00:00
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
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
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
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
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
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
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
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
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
Martin Storsjö
Howard Chu
Stefano Sabatini
Luca Barbato
Benjamin Larsson
Ronald S. Bultje
Jean-Daniel Dupas
Måns Rullgård
Diego Biurrun
Michael Niedermayer
Baptiste Coudurier