summaryrefslogtreecommitdiff
path: root/libavformat/sdp.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (47 commits) lavc: hide private symbols. lavc: deprecate img_get_alpha_info(). lavc: use avpriv_ prefix for ff_toupper4. lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits. lavc: use avpriv_ prefix for ff_ac3_parse_header. lavc: use avpriv_ prefix for ff_frame_rate_tab. lavc: rename ff_find_start_code to avpriv_mpv_find_start_code lavc: use avpriv_ prefix for ff_split_xiph_headers. lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header. lavc: use avpriv_ prefix for some dv symbols used in lavf. lavc: use avpriv_ prefix for some flac symbols used in lavf. lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf. lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf. lavc: use avpriv_ prefix for ff_aac_parse_header(). lavf: hide private symbols. lavf: use avpriv_ prefix for some dv functions. lavf: use avpriv_ prefix for ff_new_chapter(). avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2() avcodec: clarify documentation of CODEC_CAP_DELAY ... Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dv.c libavcodec/dvdata.c libavcodec/dvdata.h libavcodec/libspeexenc.c libavcodec/mpegvideo.c libavcodec/version.h libavformat/avidec.c libavformat/dv.c libavformat/dv.h libavformat/flvenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/oggparsespeex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use avpriv_ prefix for ff_split_xiph_headers.Anton Khirnov2011-10-20
| | | | | | | | It's used in lavf.
| * lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.Anton Khirnov2011-10-20
| | | | | | | | | | Specifically, ff_mpeg4audio_sample_rates, ff_mpeg4audio_get_config and ff_copy_pce_data
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) fate: allow testing with libavfilter disabled x86: XOP/FMA4 CPU detection support ws_snd: misc cosmetic clean-ups ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead. ws_snd: use memcpy() and memset() instead of loops ws_snd: use samples pointer for loop termination instead of a separate iterator variable. ws_snd: make sure number of channels is 1 ws_snd: add some checks to prevent buffer overread or overwrite. ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16. flacdec: fix buffer size checking in get_metadata_size() rtp: Simplify ff_rtp_get_payload_type rtpenc: Add a payload type private option rtp: Correct ff_rtp_get_payload_type documentation avconv: replace all fprintf() by av_log(). avconv: change av_log verbosity from ERROR to FATAL for fatal errors. cmdutils: replace fprintf() by av_log() avtools: parse loglevel before all the other options. oggdec: add support for Xiph's CELT codec sol: return error if av_get_packet() fails. cosmetics: reindent and pretty-print ... Conflicts: avconv.c cmdutils.c libavcodec/avcodec.h libavcodec/version.h libavformat/oggparsecelt.c libavformat/utils.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Add a payload type private optionRafaël Carré2011-09-26
| | | | | | | | | | | | | | | | Specifying the payload type is useful when the type number has already been negotiated before creating the stream, for example in SIP protocol. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtp: factorize dynamic payload type fallback flvdec: Ignore the index if it's from a creator known to be different cmdutils: move grow_array out of #if CONFIG_AVFILTER avconv: actually set InputFile.rate_emu ratecontrol: update last_qscale_for sooner Fix unnecessary shift with 9/10bit vertical scaling prores: mark prores as intra-only in libavformat/utils.c:is_intra_only() prores: return more meaningful error values prores: improve error message wording prores: cosmetics: prettyprinting, drop useless parentheses prores: lowercase AVCodec name entry Conflicts: cmdutils.c libavcodec/proresdec_lgpl.c tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtp: factorize dynamic payload type fallbackRafaël Carré2011-09-23
| | | | | | | | | | | | | | Move the identical code in rtp_write_header() and ff_sdp_write_media() inside ff_rtp_get_payload_type() Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: bitstream: Properly promote av_reverse values before shifting. libavutil/swscale: YUV444P10/YUV444P9 support. H.264: Fix high bit depth explicit biweight h264: Fix 10-bit H.264 x86 chroma v loopfilter asm. Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog. Update copyright year for ac3enc_opts_template.c. adts: Adjust frame size mask to follow the specification. movenc: Add RTP muxer/hinter options movenc: Pass the RTP AVFormatContext to the SDP generation rtspenc: Add RTP muxer options rtspenc: Add an AVClass for setting muxer specific options rtpenc_chain: Pass the rtpflags options through to the chained muxer rtpenc: Declare the rtp flags private AVOptions in rtpenc.h sdp: Reindent after the previous commit rtpenc: MP4A-LATM payload support avoptions: Add an av_opt_flag_is_set function for inspecting flag fields sdp: Allow passing an AVFormatContext to the SDP generation mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry. mpeg12: more advanced ffmpeg mpeg2 aspect guessing code. swscale: split YUYV output out of yuv2packed[12X]_c(). Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/h264dsp_template.c libavcodec/mpeg12.c libavformat/aacdec.c libavformat/avidec.c libavformat/internal.h libavformat/movenc.c libavformat/rtpenc.c libavformat/rtpenc_latm.c libavformat/sdp.c libavformat/version.h libavutil/avutil.h libavutil/pixfmt.h libswscale/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sdp: Reindent after the previous commitMartin Storsjö2011-06-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc: MP4A-LATM payload supportJuan Carlos Rodriguez2011-06-10
| | | | | | | | | | | | | | This is enabled with an AVOption on the RTP muxer. The SDP generator looks for a latm flag in the rtpflags field. Signed-off-by: Martin Storsjö <martin@martin.st>
| * sdp: Allow passing an AVFormatContext to the SDP generationMartin Storsjö2011-06-10
| | | | | | | | | | | | | | Options from the AVFormatContext can be read for modifying the generated SDP. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove all uses of now deprecated metadata functions.Anton Khirnov2011-06-08
| |
* | ReindentMartin Storsjö2011-05-20
| |
* | rtpenc: MP4A-LATM payload supportJuan Carlos Rodriguez2011-05-20
| |
* | sdp: Allow passing AVFormatContext flags to the SDP generationMartin Storsjö2011-05-20
| |
* | 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 a parameter of av_sdp_create from buff->bufAnton Khirnov2011-04-08
| | | | | | | | This is more consistent with the rest of the API.
| * 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.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Move find_info_tag to lavu and add av_ prefix to itAnton Khirnov2011-02-17
| | | | | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* | Move find_info_tag to lavu and add av_ prefix to itAnton Khirnov2011-02-18
|/ | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit ab0287fcbdebc8ff416214535d7ee8424406990e)
* sdp: Add a framesize attribute to H.263 SDP descriptionsMartin Storsjö2010-12-20
| | | | | | | | While not mentioned in RFC 4629, this is required for H.263 in 3GPP TS 26.234. It is in practice required for playback with Android stagefright and on Samsung bada phones. Originally committed as revision 26062 to svn://svn.ffmpeg.org/ffmpeg/trunk
* sdp: Conditionally compile code using AF_INET6Martin Storsjö2010-10-19
| | | | | | Should fix compilation in environments unaware of IPv6. Originally committed as revision 25528 to svn://svn.ffmpeg.org/ffmpeg/trunk
* sdp: Only specify the TTL for IPv4 addressesMartin Storsjö2010-10-08
| | | | | | According to RFC 4566, a TTL value must not be present for IPv6 multicast. Originally committed as revision 25412 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ReindentMartin Storsjö2010-10-07
| | | | Originally committed as revision 25390 to svn://svn.ffmpeg.org/ffmpeg/trunk
* sdp: Don't require the explicit ?multicast optionMartin Storsjö2010-10-07
| | | | | | No such option is used anywhere else. Instead, detect the address type. Originally committed as revision 25389 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Handle G.722 in RTP, and all the exceptions mandated in RFC 3551Martin Storsjö2010-09-15
| | | | Originally committed as revision 25125 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make stub version of ff_sdp_write_media() match its prototypeAndreas Öman2010-08-25
| | | | | | | | Used when compiled without CONFIG_RTP_MUXER Fallout from r24915 Originally committed as revision 24935 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ReindentMartin Storsjö2010-08-25
| | | | Originally committed as revision 24919 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify resolve_destination in sdp.c further, now that we don't enforce ↵Martin Storsjö2010-08-25
| | | | | | IPv4 any longer Originally committed as revision 24918 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l, add new function parameters to resolve_destination for !config_network tooMartin Storsjö2010-08-25
| | | | Originally committed as revision 24917 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reindent, rewrap linesMartin Storsjö2010-08-25
| | | | Originally committed as revision 24916 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Properly handle IPv6 addresses in the SDP generationMartin Storsjö2010-08-25
| | | | Originally committed as revision 24915 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add RTP packetization of VP8Josh Allmann2010-08-16
| | | | | | Patch by Josh Allmann, joshua dot allmann at gmail Originally committed as revision 24797 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rtpenc_xiph: Set the ident value via a defineMartin Storsjö2010-08-09
| | | | Originally committed as revision 24749 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add RTP packetization of Theora and VorbisJosh Allmann2010-08-07
| | | | | | Patch by Josh Allmann, joshua dot allmann at gmail Originally committed as revision 24735 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
* Use a bitstream filter for converting the extradata syntax when generating ↵Luca Abeni2010-06-11
| | | | | | | | an SDP. This allows to generate correct SDPs for H.264 video in "MP4 syntax". Originally committed as revision 23572 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ff_sdp_write_media a lavf-internal functionMartin Storsjö2010-05-18
| | | | | | | This is in preparation for RTP hinting in the MOV muxer, where it needs to be able to create SDP fragments for each media stream. Originally committed as revision 23160 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
* Add a lowercase parameter to ff_data_to_hexMartin Storsjö2010-03-25
| | | | Originally committed as revision 22665 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
* Make sure the destination address is written as an IP address in the SDPMartin Storsjö2010-01-12
| | | | | | Patch by Martin Storsjo (martin AT martin DOT st) Originally committed as revision 21163 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Always set the destination address even if no port was found.Martin Storsjö2010-01-07
| | | | | | Patch by Martin Storsjo (martin AT martin DOT st) Originally committed as revision 21057 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check the URL used for the SDP destination.Martin Storsjö2010-01-07
| | | | | | Patch by Martin Storsjo (martin AT martin DOT st) Originally committed as revision 21056 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use different dynamic payload types for audio and video.Luca Abeni2009-12-27
| | | | Originally committed as revision 20940 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use RTP_PT_PRIVATE in sdp.c instead of hardcoding 96.Luca Abeni2009-12-26
| | | | Originally committed as revision 20922 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Emit the SDP lines in the correct orderLuca Abeni2009-10-17
| | | | Originally committed as revision 20262 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for AMR audio in the RTP muxerMartin Storsjö2009-04-08
| | | | | | patch by Martin Storsjö (martin AT martin DOT st) Originally committed as revision 18375 to svn://svn.ffmpeg.org/ffmpeg/trunk