summaryrefslogtreecommitdiff
path: root/libavformat/rtspenc.c
Commit message (Collapse)AuthorAge
* 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: 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-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) ac3enc: move extract_exponents inner loop to ac3dsp avio: deprecate url_get_filename(). avio: deprecate url_max_packet_size(). avio: make url_get_file_handle() internal. avio: make url_filesize() internal. avio: make url_close() internal. avio: make url_seek() internal. avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together avio: make url_write() internal. avio: make url_read_complete() internal. avio: make url_read() internal. avio: make url_open() internal. avio: make url_connect internal. avio: make url_alloc internal. applehttp: Merge two for loops applehttp: Restructure the demuxer to use a custom AVIOContext applehttp: Move finished and target_duration to the variant struct aacenc: reduce the number of loop index variables avio: deprecate url_open_protocol avio: deprecate url_poll and URLPollEntry ... Conflicts: libavformat/applehttp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: make url_get_file_handle() internal.Anton Khirnov2011-04-04
| |
| * avio: make url_write() internal.Anton Khirnov2011-04-04
| |
* | 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
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: avio: make udp_set_remote_url/get_local_port internal. asfdec: also subtract preroll when reading simple index object matroskaenc: remove a variable that's unused after bc17bd9. avio: cosmetics - nicer vertical alignment. Remove unnecessary icc version checks Disable 'attribute "foo" ignored' warnings from icc rtsp: Don't use a locale dependent format string Add xd55 codec tag for XDCAM HD422 720p25 CBR files. configure: get libavcodec version from new version.h header lavc: move the version macros to a new installed header. matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config Do not use format string "%0.3f" for RTSP Range field. Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder. Document usage of import libraries created by dlltool configure: Set the correct lib target for arm/wince dlltool fate: simplify regression-funcs.sh fate: add support for multithread testing Conflicts: libavformat/rtspdec.c libavutil/attributes.h libavutil/internal.h libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Don't use a locale dependent format stringMartin Storsjö2011-03-23
| | | | | | | | | | | | | | In this particular case, we aren't ever printing anything else than 0.000 anyway. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * rtsp: Don't store RTSPStream in AVStream->priv_dataMartin Storsjö2011-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For mpegts in RTP, there isn't a direct mapping between RTSPStreams and AVStreams, and the RTSPStream isn't ever stored in AVStream->priv_data, which was earlier leaked. The fix for this leak, in ea7f080749d68a431226ce196014da38761a0d82, lead to double frees for other, normal RTP streams. This patch avoids storing RTSPStreams in AVStream->priv_data, thus avoiding the double free. The RTSPStreams are always available via RTSPState->rtsp_streams anyway. Tested with MS-RTSP, RealRTSP, DSS and mpegts/RTP. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * rtspenc: include os_support.h for system without HAVE_POLL_HDave Yeo2011-01-28
| | | | | | | | | | | | fix compile on OS/2 Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
| * os: replace select with pollLuca Barbato2011-01-28
| | | | | | | | | | Select has limitations on the fd values it could accept and silently breaks when it is reached.
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-26
| | | | | | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
* | rtsp: Don't store RTSPStream in AVStream->priv_dataMartin Storsjö2011-02-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For mpegts in RTP, there isn't a direct mapping between RTSPStreams and AVStreams, and the RTSPStream isn't ever stored in AVStream->priv_data, which was earlier leaked. The fix for this leak, in ea7f080749d68a431226ce196014da38761a0d82, lead to double frees for other, normal RTP streams. This patch avoids storing RTSPStreams in AVStream->priv_data, thus avoiding the double free. The RTSPStreams are always available via RTSPState->rtsp_streams anyway. Tested with MS-RTSP, RealRTSP, DSS and mpegts/RTP. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit d9c0510e22821baa364306d867ffac45da0620c8)
* | rtspenc: include os_support.h for system without HAVE_POLL_HDave Yeo2011-01-30
| | | | | | | | | | | | | | fix compile on OS/2 Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit a0788cc6273a7a33cc111f7248248c71fd009916)
* | os: replace select with pollLuca Barbato2011-01-30
| | | | | | | | | | | | Select has limitations on the fd values it could accept and silently breaks when it is reached. (cherry picked from commit a8475bbdb64e638bd8161df9647876fd23f8a29a)
* | Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-28
|/ | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts. (cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
* rtsp: Add a method parameter to ff_rtsp_read_replyMartin Storsjö2011-01-02
| | | | Originally committed as revision 26189 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rtsp: Move rtsp_setup_output_streams into rtspenc.cMartin Storsjö2010-10-29
| | | | Originally committed as revision 25600 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rtp: Replace hardcoded RTCP packet types with definesJosh Allmann2010-08-25
| | | | | | Patch by Josh Allmann, joshua dot allmann at gmail Originally committed as revision 24912 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Include lavu headers using quotes instead of angle bracketsMartin Storsjö2010-07-18
| | | | Originally committed as revision 24315 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make the RTSP muxer use rtsp_hd_out, for consistencyMartin Storsjö2010-06-08
| | | | Originally committed as revision 23535 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unused local variablesMartin Storsjö2010-06-05
| | | | Originally committed as revision 23496 to svn://svn.ffmpeg.org/ffmpeg/trunk
* RTSP: Add a second URLContext for outgoing messagesJosh Allmann2010-06-05
| | | | | | | Done in preparation for RTSP over HTTP. Patch by Josh Allmann, joshua dot allmann at gmail Originally committed as revision 23494 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rtspenc: Write the interleaving header in the same buffer as the packet dataMartin Storsjö2010-06-04
| | | | Originally committed as revision 23465 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change the default codecs for the rtsp muxer to mpeg4 and aacMartin Storsjö2010-05-21
| | | | | | These codecs in RTP are supported by many players. Originally committed as revision 23209 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Take ff_write_chained in use in the mov rtp hinter and in the rtsp muxerMartin Storsjö2010-05-21
| | | | Originally committed as revision 23208 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add separate method/url parameters to the rtsp_send_cmd functionsMartin Storsjö2010-03-25
| | | | Originally committed as revision 22675 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for TCP as lower transport in the RTSP muxerMartin Storsjö2010-03-22
| | | | Originally committed as revision 22634 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ReindentMartin Storsjö2010-03-15
| | | | Originally committed as revision 22549 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in ↵Martin Storsjö2010-03-15
| | | | | | | | rtsp_write_packet. Skip interleaved packets manually and recheck if there's more to be read. Originally committed as revision 22548 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use rt->control_uri consequently instead of s->filename in all RTSP commandsMartin Storsjö2010-03-09
| | | | Originally committed as revision 22403 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use ff_url_join for assembling URLs, instead of snprintfMartin Storsjö2010-03-05
| | | | | | | | | This ensures proper escaping of numerical IPv6 addresses. The RTSP (de)muxer needs its own network initialization, since it isn't a protocol and url_open hasn't been called yet. Originally committed as revision 22226 to svn://svn.ffmpeg.org/ffmpeg/trunk
* RTSP muxer: Use a local copy of the AVPacket for sending to the chained muxerMartin Storsjö2010-02-26
| | | | | | | This way, we avoid overwriting stream_index in the user's AVPacket with a nonsense value. Originally committed as revision 22081 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
* Add an RTSP muxerMartin Storsjö2010-02-22
Originally committed as revision 21971 to svn://svn.ffmpeg.org/ffmpeg/trunk