summaryrefslogtreecommitdiff
path: root/ffserver.c
Commit message (Collapse)AuthorAge
...
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Eliminate pointless '#if 1' statements without matching '#else'.Diego Biurrun2011-04-26
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Handle unicode file names on windows rtp: Rename the open/close functions to alloc/free Lowercase all ff* program names. Refer to ff* tools by their lowercase names. NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg. Replace `` by $() syntax in shell scripts. patcheck: Allow overiding grep program(s) through environment variables. NOT Pulled Remove stray libavcore and _g binary references. vorbis: Rename decoder/encoder files to follow general file naming scheme. aacenc: Fix whitespace after last commit. cook: Fix small typo in av_log_ask_for_sample message. aacenc: Finish 3GPP psymodel analysis for non mid/side cases. Remove RDFT dependency from AAC decoder. Add some debug log messages to AAC extradata Fix mov debug (u)int64_t format strings. bswap: use native types for av_bwap16(). doc: FLV muxing is supported. applehttp: Handle AES-128 encrypted streams Add a protocol handler for AES CBC decryption with PKCS7 padding doc: Mention that DragonFly BSD requires __BSD_VISIBLE set Conflicts: ffplay.c ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Lowercase all ff* program names.Diego Biurrun2011-04-23
| |
| * Replace more FFmpeg instances by Libav or ffmpeg.Diego Biurrun2011-04-23
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * prefer avio_check() over url_exist()Stefano Sabatini2011-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem with url_exist() is that it tries to open a resource in RDONLY mode. If the file is a FIFO and there is already a reading client, the open() call will hang. By using avio_check() with access mode of 0, the second reading process will check if the file exists without attempting to open it, thus avoiding the lock. Fix issue #1663. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbolsStefano Sabatini2011-04-19
| | | | | | | | | | | | | | | | Make AVIO_FLAG_ access constants work as flags, and in particular fix the behavior of functions (such as avio_check()) which expect them to be flags rather than modes. This breaks API.
| * lavc: remove the FF_API_SET_STRING_OLD cruft.Anton Khirnov2011-04-19
| |
| * lavf: remove FF_API_MAX_STREAMS cruftAnton Khirnov2011-04-19
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: bump minor and add an APIChanges entry for avformat cleanup lavf: get rid of ffm-specific stuff in avformat.h Not pulled: avio: deprecate av_protocol_next(). avio: add a function for iterating though protocol names. lavf: rename a parameter of av_sdp_create from buff->buf lavf: rename avf_sdp_create to av_sdp_create. lavf: make av_guess_image2_codec internal avio: make URLProtocol internal. avio: make URLContext internal. lavf: mark av_pkt_dump(_log) for remove on $next+1 bump. lavf: use designated initializers for all protocols applehttp: don't use deprecated url_ functions. avio: move two ff_udp_* functions from avio_internal to url.h asfdec: remove a forgotten declaration of nonexistent function avio: deprecate the typedef for URLInterruptCB Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: get rid of ffm-specific stuff in avformat.hAnton Khirnov2011-04-08
| |
| * lavf: rename avf_sdp_create to av_sdp_create.Anton Khirnov2011-04-08
| | | | | | | | The new name is more consistent with the rest of the API.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proto: include os_support.h in network.h matroskaenc: don't write an empty Cues element. lavc: add a FF_API_REQUEST_CHANNELS deprecation macro avio: move extern url_interrupt_cb declaration from avio.h to url.h avio: make av_register_protocol2 internal. avio: avio_ prefix for url_set_interrupt_cb. avio: AVIO_ prefixes for URL_ open flags. proto: introduce listen option in tcp doc: clarify configure features proto: factor ff_network_wait_fd and use it on udp Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: AVIO_ prefixes for URL_ open flags.Anton Khirnov2011-04-07
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: fix partial run when no samples path is specified ARM: NEON fixed-point forward MDCT ARM: NEON fixed-point FFT lavf: bump minor version and add an APIChanges entry for avio changes avio: simplify url_open_dyn_buf_internal by using avio_alloc_context() avio: make url_fdopen internal. avio: make url_open_dyn_packet_buf internal. avio: avio_ prefix for url_close_dyn_buf avio: avio_ prefix for url_open_dyn_buf avio: introduce an AVIOContext.seekable field ac3enc: use generic fixed-point mdct lavfi: add fade filter Change yadif to not use out of picture lines. lavc: deprecate AVCodecContext.antialias_algo lavc: mark mb_qmin/mb_qmax for removal on next major bump. Conflicts: doc/filters.texi libavcodec/ac3enc_fixed.h libavcodec/ac3enc_float.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: make url_open_dyn_packet_buf internal.Anton Khirnov2011-04-03
| | | | | | | | | | | | | | It doesn't look fit to be a part of the public API. Adding a temporary hack to ffserver to be able to use it, should be cleaned up when somebody is up for it.
| * avio: avio_ prefix for url_close_dyn_bufAnton Khirnov2011-04-03
| |
| * avio: avio_ prefix for url_open_dyn_bufAnton Khirnov2011-04-03
| |
| * avio: introduce an AVIOContext.seekable fieldAnton Khirnov2011-04-03
| | | | | | | | Use it instead of url_is_streamed and AVIOContext.is_streamed.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* avio: deprecate url_open_bufAnton Khirnov2011-03-16
| | | | | | | It's only used in one place and does the same thing as avio_alloc_context. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: avio_ prefix for url_fprintfAnton Khirnov2011-03-16
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: rename url_fopen/fclose -> avio_open/close.Anton Khirnov2011-02-23
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* libavformat: Remove FF_NETERRNO()Martin Storsjö2011-02-23
| | | | | | | | | | | | | | Map EAGAIN and EINTR from ff_neterrno to the normal AVERROR() error codes. Provide fallback definitions of other errno.h network errors, mapping them to the corresponding winsock errors. This eases catching these error codes in common code, without having to distinguish between FF_NETERRNO(EAGAIN) and AVERROR(EAGAIN). This fixes roundup issue 2614, unbreaking blocking network IO on windows. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: avio: avio_ prefixes for put_* functionsAnton Khirnov2011-02-21
| | | | | | | | | | | | In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 09:32:58 +0000