summaryrefslogtreecommitdiff
path: root/ffserver.c
Commit message (Collapse)AuthorAge
* avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* ffserver: Try matching the RTSP url without a trailing slashMartin Storsjö2011-02-17
| | | | | | If the client sends PLAY/PAUSE requests with the same url as specified in Content-Base, these requests may have urls with trailing slashes.
* Move find_info_tag to lavu and add av_ prefix to itAnton Khirnov2011-02-17
| | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* Replace remaining uses of parse_date with av_parse_time.Anton Khirnov2011-02-16
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* ffserver: set the sample aspect ratioNicolas George2011-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi. It seems that ffserver sets sample_aspect_ratio to an invalid value and lavf rejects it. I am not sure what I am doing here, but the attached patch actually solves something: using the following config: CustomLog - NoDaemon RTSPPort 5454 <Stream test1-rtsp.mpg> Format rtp File "/tmp/test1-rtsp.mpg" </Stream> it allows a somewhat old ffplay (unaffected by the content-base issue I spoke of in another thread) to play the stream. Without it, ffserver logs this and closes the stream: Wed Feb 16 14:52:14 2011 [rtp @ 0x1399de0]Aspect ratio mismatch between encoder and muxer layer Regards, -- Nicolas George From 1b89c3c2164335060e87567b27deb0d354e0a814 Mon Sep 17 00:00:00 2001 From: Nicolas George <nicolas.george@normalesup.org> Date: Wed, 16 Feb 2011 14:44:31 +0100 Subject: [PATCH] ffserver: set the sample aspect ratio. Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
* Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* ffserver: put gcc attribute under proper ifdefMans Rullgard2011-01-24
|
* ffserver: cleanupReinhard Tartler2011-01-23
| | | | | remove the trivial function do_switch_stream as it doesn't help to make the code easier to understand.
* Unbreak ffserverLuca Barbato2011-01-07
| | | | | | Make sure the sample_aspect_ratio is 0 and not 0/0. Originally committed as revision 26254 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rtsp: Pass the method name to ff_rtsp_parse_lineMartin Storsjö2011-01-02
| | | | Originally committed as revision 26191 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement get_preset_file() in cmdutils.h and use it to factorize codeStefano Sabatini2010-11-04
| | | | | | from ffmpeg.c and ffserver.c. Originally committed as revision 25679 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffserver: use a local MAX_STREAMS limitAurelien Jacobs2010-10-15
| | | | Originally committed as revision 25495 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffserver: fix prepare_sdp_description() to dynamically allocate streamsAurelien Jacobs2010-10-15
| | | | Originally committed as revision 25494 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 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