summaryrefslogtreecommitdiff
path: root/ffserver.c
Commit message (Collapse)AuthorAge
* Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()Stefano Sabatini2010-07-26
| | | | | | | | | | | 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
* Also use 503 for bandwidth limit exceededHoward Chu2010-07-08
| | | | Originally committed as revision 24107 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix "server too busy" status codeHoward Chu2010-07-08
| | | | Originally committed as revision 24105 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ff_url_split() publicMåns Rullgård2010-06-27
| | | | | | | 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
* ffserver: Use avcodec_copy_context instead of manually copying an AVCodecContextMartin Storsjö2010-06-22
| | | | Originally committed as revision 23692 to svn://svn.ffmpeg.org/ffmpeg/trunk
* When reading a stream, should retry on EAGAIN instead of just failing. Also,Howard Chu2010-06-16
| | | | | | | 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
* Support presets in ffserver.confHoward Chu2010-06-08
| | | | Originally committed as revision 23524 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffserver: Calculate cur_pts using first_pts as origin instead of ist->start_timeMartin Storsjö2010-06-03
| | | | | | | 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
* ffserver: Allow floating point audio bit ratesMartin Storsjö2010-06-02
| | | | | | 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
* ffserver: Send a Content-Base header in the reply to RTSP DESCRIBE requestsMartin Storsjö2010-05-25
| | | | | | This is needed for QuickTime Player to be able to connect properly. Originally committed as revision 23325 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffserver: Fix one of the codec parameter checksMartin Storsjö2010-05-24
| | | | | | | | 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
* ffserver: Fix streaming with more than one streamMartin Storsjö2010-05-24
| | | | | | Fix by Howard Chu, hyc at highlandsun dot com Originally committed as revision 23294 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffserver: Fix extradata handlingHoward Chu2010-05-24
| | | | | | Patch by Howard Chu, hyc at highlandsun dot com Originally committed as revision 23293 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffserver: Fix an out of bounds readMartin Storsjö2010-05-24
| | | | | | Fix by Howard Chu, hyc at highlandsun dot com Originally committed as revision 23292 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffserver: Fix another memory leakMartin Storsjö2010-05-24
| | | | | | | | | 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
* ffserver: Plug some memory leaksHoward Chu2010-05-24
| | | | | | Patch by Howard Chu, hyc at highlandsun dot com Originally committed as revision 23290 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ff_random_get_seed public, rename to av_get_random_seed, export the headerMartin Storsjö2010-05-23
| | | | | | | 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
* ffserver: Avoid busylooping while reading non-blocking inputHoward Chu2010-05-21
| | | | | | Patch by Howard Chu, hyc at highlandsun dot com Originally committed as revision 23210 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: reindentMartin Storsjö2010-05-18
| | | | Originally committed as revision 23156 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffserver: Don't set me_method unconditionallyHoward Chu2010-05-18
| | | | | | Patch by Howard Chu, hyc at highlandsun dot com Originally committed as revision 23155 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffserver: Write proper GMT date/times in Date headersHoward Chu2010-05-18
| | | | | | Patch by Howard Chu, hyc at highlandsun dot com Originally committed as revision 23154 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffserver: Make sure a destination URL is set when creating the SDPMartin Storsjö2010-05-17
| | | | | | Debugged by Howard Chu, hyc at highlandsun dot com. Originally committed as revision 23151 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Mark av_metadata_set() as deprecated, and use av_metadata_set2()Stefano Sabatini2010-04-25
| | | | | | | | 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
* Implement ffserver.c:report_config_error() and a macro for loggingStefano Sabatini2010-04-24
| | | | | | error messages / updating the error count. Originally committed as revision 22960 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Statically initialize ffserver.c:config_filename, simplify.Stefano Sabatini2010-04-24
| | | | Originally committed as revision 22959 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ffserver support rfc3550Luca Barbato2010-04-19
| | | | Originally committed as revision 22907 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add DynamicACL support for FFserver.Benjamin Larsson2010-04-07
| | | | Originally committed as revision 22815 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix FFM-based streaming from ffmpeg to ffserver. The basic problem is thatRonald S. Bultje2010-03-31
| | | | | | | | | | | 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
* Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.Jean-Daniel Dupas2010-03-31
| | | | | | Patch by Jean-Daniel Dupas, devlists shadowlab org Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Actually parse the auth headers in RTSPMartin Storsjö2010-03-25
| | | | Originally committed as revision 22677 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move resolve_host() to ffserver.cMåns Rullgård2010-03-08
| | | | | | | | | | 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
* Rename url_split to ff_url_splitMartin Storsjö2010-03-08
| | | | | | 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
* ffserver: remove bogus commentMåns Rullgård2010-03-08
| | | | Originally committed as revision 22303 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove hacks not required since HAVE_AV_CONFIG_H was unset for the appsMåns Rullgård2010-03-07
| | | | Originally committed as revision 22295 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffserver: do not use intreadwrite.hMåns Rullgård2010-03-07
| | | | | | | 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
* ffserver: use av_stristr()Måns Rullgård2010-03-06
| | | | Originally committed as revision 22252 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update to work with chunked encoding HTTP streams (as served by FFmpeg sinceRonald S. Bultje2010-03-03
| | | | | | a few months now). Fixes issue 1738. Originally committed as revision 22175 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Prefix non-static RTSP functions with ff_.Ronald S. Bultje2010-02-23
| | | | Originally committed as revision 21974 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Mark http_log() as static; it is only used in this file.Diego Biurrun2010-01-04
| | | | Originally committed as revision 21017 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use av_match_ext() in place of the deprecated match_ext() function.Stefano Sabatini2010-01-01
| | | | Originally committed as revision 21000 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use av_guess_format() in place of the deprecated guess_format().Stefano Sabatini2010-01-01
| | | | Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Deprecate and mark for deletion the function guess_stream_format(),Stefano Sabatini2009-12-31
| | | | | | | | | | 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
* Factorize common commandline options definition.Stefano Sabatini2009-11-29
| | | | Originally committed as revision 20664 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split show_formats().Michael Niedermayer2009-11-19
| | | | Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Prefer "loglevel" over "logging level number or string" as argname ofStefano Sabatini2009-10-02
| | | | | | | | | | 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
* Remove disabled code cruft.Diego Biurrun2009-09-29
| | | | Originally committed as revision 20087 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a -loglevel command line option to ffserver.Stefano Sabatini2009-09-26
| | | | | | | 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
* Move get_arg to avoid future declaration of function whenBenjamin Larsson2009-09-10
| | | | | | new code is added. Originally committed as revision 19815 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Consistently lowercase all HTML tags.Diego Biurrun2009-07-19
| | | | Originally committed as revision 19464 to svn://svn.ffmpeg.org/ffmpeg/trunk