Michael Niedermayer
d4d09329ee
Merge remote branch 'qatar/master'
...
* 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>
2011-04-09 03:17:07 +02:00
Anton Khirnov
c234d40bd9
lavf: rename a parameter of av_sdp_create from buff->buf
...
This is more consistent with the rest of the API.
2011-04-08 16:45:41 +02:00
Anton Khirnov
c3675dfe1e
lavf: rename avf_sdp_create to av_sdp_create.
...
The new name is more consistent with the rest of the API.
2011-04-08 16:45:40 +02:00
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Anton Khirnov
1b98107c8d
Move find_info_tag to lavu and add av_ prefix to it
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit ab0287fcbd
)
2011-02-18 19:52:33 +01:00
Anton Khirnov
ab0287fcbd
Move find_info_tag to lavu and add av_ prefix to it
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-02-17 15:35:18 +01:00
Martin Storsjö
9b14ec5fae
sdp: Add a framesize attribute to H.263 SDP descriptions
...
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
2010-12-20 20:46:40 +00:00
Martin Storsjö
095e5c0b6d
sdp: Conditionally compile code using AF_INET6
...
Should fix compilation in environments unaware of IPv6.
Originally committed as revision 25528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-19 07:50:40 +00:00
Martin Storsjö
6898677e54
sdp: Only specify the TTL for IPv4 addresses
...
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
2010-10-08 11:58:47 +00:00
Martin Storsjö
87b2b40a33
Reindent
...
Originally committed as revision 25390 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 08:00:03 +00:00
Martin Storsjö
10105c9b29
sdp: Don't require the explicit ?multicast option
...
No such option is used anywhere else. Instead, detect the address type.
Originally committed as revision 25389 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 07:59:35 +00:00
Martin Storsjö
0048a2a8d3
Handle G.722 in RTP, and all the exceptions mandated in RFC 3551
...
Originally committed as revision 25125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-15 17:35:39 +00:00
Andreas Öman
f06d6c751f
Make stub version of ff_sdp_write_media() match its prototype
...
Used when compiled without CONFIG_RTP_MUXER
Fallout from r24915
Originally committed as revision 24935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 21:07:04 +00:00
Martin Storsjö
5a8693ef59
Reindent
...
Originally committed as revision 24919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 13:31:33 +00:00
Martin Storsjö
7ad526d288
Simplify resolve_destination in sdp.c further, now that we don't enforce IPv4 any longer
...
Originally committed as revision 24918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 13:30:06 +00:00
Martin Storsjö
1272ae7e50
10l, add new function parameters to resolve_destination for !config_network too
...
Originally committed as revision 24917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 12:51:20 +00:00
Martin Storsjö
cc83027c67
Reindent, rewrap lines
...
Originally committed as revision 24916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 12:34:42 +00:00
Martin Storsjö
7ad1dc5447
Properly handle IPv6 addresses in the SDP generation
...
Originally committed as revision 24915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 12:29:32 +00:00
Josh Allmann
7b18d94cb3
Add RTP packetization of VP8
...
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 24797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-16 14:21:17 +00:00
Martin Storsjö
b5c4bb989d
rtpenc_xiph: Set the ident value via a define
...
Originally committed as revision 24749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-09 10:31:59 +00:00
Josh Allmann
91af5601c1
Add RTP packetization of Theora and Vorbis
...
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 24735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 11:16:07 +00:00
Måns Rullgård
f3bfe388b5
Make ff_url_split() public
...
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
2010-06-27 14:16:46 +00:00
Luca Abeni
ede13f55f0
Use a bitstream filter for converting the extradata syntax when generating 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
2010-06-11 08:01:45 +00:00
Martin Storsjö
0341b6994a
Make ff_sdp_write_media a lavf-internal function
...
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
2010-05-18 19:32:59 +00:00
Stefano Sabatini
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
Martin Storsjö
ddbeb95447
Add a lowercase parameter to ff_data_to_hex
...
Originally committed as revision 22665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 07:13:20 +00:00
Martin Storsjö
c5c6e67c28
Rename url_split to ff_url_split
...
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
2010-03-08 09:03:25 +00:00
Martin Storsjö
51a269cd97
Make sure the destination address is written as an IP address in the SDP
...
Patch by Martin Storsjo (martin AT martin DOT st)
Originally committed as revision 21163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 10:56:43 +00:00
Martin Storsjö
9ea7f03aa0
Always set the destination address even if no port was found.
...
Patch by Martin Storsjo (martin AT martin DOT st)
Originally committed as revision 21057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 08:24:44 +00:00
Martin Storsjö
c47b0738b5
Check the URL used for the SDP destination.
...
Patch by Martin Storsjo (martin AT martin DOT st)
Originally committed as revision 21056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 08:11:56 +00:00
Luca Abeni
6399c17d54
Use different dynamic payload types for audio and video.
...
Originally committed as revision 20940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-27 21:31:10 +00:00
Luca Abeni
f877954fd3
Use RTP_PT_PRIVATE in sdp.c instead of hardcoding 96.
...
Originally committed as revision 20922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-26 10:59:56 +00:00
Luca Abeni
56e6f8309e
Emit the SDP lines in the correct order
...
Originally committed as revision 20262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-17 11:15:45 +00:00
Martin Storsjö
08e696c0b2
Add support for AMR audio in the RTP muxer
...
patch by Martin Storsjö (martin AT martin DOT st)
Originally committed as revision 18375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-08 07:16:14 +00:00
Martin Storsjö
9edfaf3c6c
Add support for H.263 video in the RTP muxer
...
patch by Martin Storsjö (martin AT martin DOT st)
Originally committed as revision 18347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 06:41:55 +00:00
Martin Storsjö
99f373f3a6
Only insert the SPS and PPS NALs in sprop-parameter-sets
...
Patch by Martin Storsjö (martin AT martin DOT st)
Originally committed as revision 18343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-06 21:04:26 +00:00
Luca Abeni
0550b58f4e
Rename rtp_get_payload_type() to ff_rtp_get_payload_type(), as it is not
...
a static function
Originally committed as revision 17364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 09:36:21 +00:00
Diego Biurrun
7be75dd7df
cosmetics: comment grammar/spelling fixes
...
Originally committed as revision 17077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 22:06:55 +00:00
Aurelien Jacobs
f3650b239e
use new metadata API in rtp muxer
...
Originally committed as revision 16960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 23:08:25 +00:00
Aurelien Jacobs
b250f9c66d
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
...
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
Stefano Sabatini
91cd7eb633
Rename functions in sdp.c for consistency's sake.
...
Originally committed as revision 15953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-29 13:55:03 +00:00
Ronald S. Bultje
f1c80e3578
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
...
move it from sdp.c into utils.c. Also add new header internal.h specifically
for lavf-specific internal API. See discussion in "Realmedia patch" thread
on mailinglist.
Originally committed as revision 15002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 23:43:28 +00:00
Stefano Sabatini
c16184e9ba
Fix a typo in sdp_write_header(): change "IPV4", which is not a valid
...
network address type, to "IP4".
Originally committed as revision 14465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-29 10:45:53 +00:00
Stefano Sabatini
265fccccde
Print libavformat version in outgoing SDPs.
...
Originally committed as revision 14106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 07:05:57 +00:00
Diego Biurrun
245976da2a
Use full path for #includes from another directory.
...
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Diego Biurrun
4b13335d1c
Use correct length modifier for pointer diff argument in av_log() call.
...
Originally committed as revision 13057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-04 10:35:13 +00:00
Luca Abeni
83cc23c5d3
Add some information about the stream bitrate, if available
...
Originally committed as revision 12331 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 13:31:24 +00:00
Reimar Döffinger
a1fc4d4aa8
Missing const, fix warnings:
...
sdp.c:115: warning: assignment discards qualifiers from pointer target type
sdp.c:120: warning: assignment discards qualifiers from pointer target type
Originally committed as revision 12151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 21:58:54 +00:00
Luca Abeni
29e35d6776
Support out-of-band parameter sets in SDP for H.264 video
...
Originally committed as revision 11590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-21 14:28:58 +00:00
Luca Abeni
b21cd0bcb5
Add minimal support for H.264 video in the SDP generator
...
Originally committed as revision 11585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-21 11:09:06 +00:00