Commit Graph

6607 Commits

Author SHA1 Message Date
Martin Storsjö
eced8fa02e rtsp: Move the rtsp_probe function to the demuxer code block
This function is only used by the RTSP demuxer.

Originally committed as revision 25537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-21 12:25:12 +00:00
Martin Storsjö
a66d44f0d2 Restore alphabetical order
Originally committed as revision 25536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-21 12:19:14 +00:00
Martin Storsjö
44b70ce563 rtsp: Untangle the dependencies between the RTSP/SDP demuxers and RTSP muxer
This allows compilation of one of them without requiring the others'
dependencies to be present.

Originally committed as revision 25535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-21 12:18:48 +00:00
Martin Storsjö
8bf0f96954 rtsp: Reorder functions
Originally committed as revision 25534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-21 12:13:02 +00:00
Pascal Massimino
ac6d020ffa cleanup image2pipe_{de}muxer fields
Originally committed as revision 25531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-21 00:57:53 +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ö
44594cc798 Add a demuxer for receiving raw rtp:// URLs without an SDP description
The demuxer inspects the payload type of a received RTP packet and
handles the cases where the content is fully described by the payload type.

Originally committed as revision 25527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-19 07:38:53 +00:00
Aurelien Jacobs
a3a29c2651 metadata: make av_metadata_set2 case insensitive by default
Originally committed as revision 25515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-18 12:45:15 +00:00
Michael Niedermayer
94bdb1f80c Avoid negative SCR in mpeg ps muxer.
Fixes a scr issue reported with dvdauthor ([FFmpeg-user] FFMPEG encoded MPEG-2 video causes error in DVDAuthor)

Originally committed as revision 25512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-16 21:31:31 +00:00
Anton Khirnov
ad7768f4c4 add ff_ prefix to metadata_conv()
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-16 13:20:41 +00:00
Anton Khirnov
d60a9f52eb lavf: simplify setting the encoder ident tag.
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-16 13:07:20 +00:00
Martin Storsjö
fb66c31da4 Fix building, include the header instead of the source file
Builds only seemed to have been broken in some configurations, though.

Originally committed as revision 25499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-16 08:50:50 +00:00
Baptiste Coudurier
96d1e75a0c In mov muxer, write artist metadata tag
Originally committed as revision 25498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 23:23:47 +00:00
Baptiste Coudurier
edd33cb6fa In mov muxer, use correct metadata tag for encoder, and use the generic metadata api name
Originally committed as revision 25497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 23:16:11 +00:00
Martin Storsjö
946df0598b rtpdec: Return AVERROR(EAGAIN) for mpegts parsing errors
This indicates that there was no error that needs to be reported to the
caller, so we can move on to parse the next packet immediately, if
available. The only error code that ff_mpegts_parse_packet can return
indicates that there was no packet to return from the provided data, for
which it returns -1.

Originally committed as revision 25496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 21:32:21 +00:00
Anton Khirnov
03700d399b Export metadata in the generic format. Deprecate old conversion API.
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 19:04:25 +00:00
Aurelien Jacobs
ed09233fa2 cosmetic: alignment
Originally committed as revision 25492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 18:30:43 +00:00
Aurelien Jacobs
13728334e8 add FF_API_SYMVER define to disable symver compatibility functions
Originally committed as revision 25491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 18:25:01 +00:00
Aurelien Jacobs
114c9a5925 add FF_API_FIRST_FORMAT define to drop deprecated first_?format from public api
Originally committed as revision 25489 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 14:25:36 +00:00
Aurelien Jacobs
0139fdea08 add FF_API_PARAMETERS_CODEC_ID define to disable the deprecated codec_id
fields in AVFormatParameters

Originally committed as revision 25488 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 14:19:01 +00:00
Aurelien Jacobs
d1742ff779 add FF_API_LAVF_UNUSED define to disable the unused struct fields
Originally committed as revision 25487 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 14:12:25 +00:00
Aurelien Jacobs
634e0304a8 add FF_API_READ_SEEK define to drop usage of AVInputFormat.read_seek
and delay this transition to v54 as it is currently not functional

Originally committed as revision 25486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 13:39:15 +00:00
Aurelien Jacobs
d87a521cde add FF_API_PARSE_FRAME_PARAM define to disable the deprecated
parse_image_size() and parse_frame_rate() public functions

Originally committed as revision 25485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 13:33:23 +00:00
Aurelien Jacobs
ade800c5b7 properly check for FF_API_URL_CLASS instead of LIBAVFORMAT_VERSION_MAJOR
Originally committed as revision 25484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 13:09:35 +00:00
Aurelien Jacobs
ca51d86c96 add FF_API_ALLOC_FORMAT_CONTEXT define to disable the deprecated
av_alloc_format_context() public function

Originally committed as revision 25483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 12:59:45 +00:00
Aurelien Jacobs
88e44314ea add FF_API_URL_SPLIT define to disable the deprecated ff_url_split() function
Originally committed as revision 25482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 12:54:12 +00:00
Aurelien Jacobs
8ef30ac1f3 add FF_API_UDP_GET_FILE define to disable the deprecated udp_get_file_handle()
public function

Originally committed as revision 25481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 12:49:48 +00:00
Aurelien Jacobs
198ac67fe8 add FF_API_GUESS_FORMAT define to disable the deprecated guess_format()
and guess_stream_format() public functions

Originally committed as revision 25480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 12:45:14 +00:00
Anton Khirnov
a15c7fd6cb Deprecate old API.
Patch by Anton Khirnov, anton khirnov net

Originally committed as revision 25479 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 09:41:20 +00:00
Anton Khirnov
81e5ff7ae2 vorbiscomment: change ff_vorbiscomment_write to take an AVMetadata**
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-14 19:08:31 +00:00
Martin Storsjö
54b2a4238c sapdec: Include sys/time.h for struct timeval
This hopefully fixes compile errors on OS/2

Originally committed as revision 25466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-13 11:09:06 +00:00
Martin Storsjö
01c8d258da Add a SAP demuxer
Originally committed as revision 25463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-13 09:06:59 +00:00
Martin Storsjö
65cdee9c95 rtpdec: Don't use the no reordering codepath if there already is a queue
Originally committed as revision 25462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-13 08:47:34 +00:00
Martin Storsjö
ddcf841191 rtpdec: Handle wrapping seq numbers in has_next_packet properly
Originally committed as revision 25461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-13 08:15:39 +00:00
Martin Storsjö
d678a6fd82 rtpdec: Parse the next packet in the sequence if it is available, if the previous packet didn't return any data
Originally committed as revision 25460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-13 08:14:30 +00:00
Martin Storsjö
91ec7aea20 rtpdec: Return AVERROR(EAGAIN) if out of data for mpegts, pass returned error codes through
Originally committed as revision 25459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-13 08:13:53 +00:00
Martin Storsjö
f6e138b4f4 rtpdec: Don't call the depacketizer to return more data unless it actually said it has more data
It may have returned a negative number for an error (e.g. AVERROR(EAGAIN),
if more data is required for it to be able to return a complete packet).

Originally committed as revision 25458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-13 08:13:07 +00:00
Martin Storsjö
4ffff36751 rtpdec: Split out storing of the depacketization return value to a separate function
This makes the code less fragile and easier to understand.

Originally committed as revision 25457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-13 08:12:23 +00:00
Martin Storsjö
ad64a807a9 Add forgotten minor bump and changelog entry for the SAP muxer
Originally committed as revision 25444 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-11 11:50:33 +00:00
Alex Converse
d256d21e3f oggenc: Don't use char* to point to a string constant.
Originally committed as revision 25440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-10 21:15:21 +00:00
Peter Ross
1e6f8d53fc cafdec: Handle ALAC extradata.
This fixes roundup issue 2284.

Originally committed as revision 25430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-10 00:50:37 +00:00
Martin Storsjö
c689cccec9 libavformat: Always build id3v1.o and id3v2.o
Functions from these files are referenced from utils.c now. This fixes
building with --disable-everything.

Originally committed as revision 25425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-09 14:58:46 +00:00
Martin Storsjö
1b40d4966c sapenc: Use the normal URL port as RTP port
This makes the URL handling consistent - the URL hostname is used as
destination for the RTP packets, so the URL port should also belong to that.
Now the options announce_addr= and announce_port specify where the
announcements are sent.

Originally committed as revision 25424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-09 14:39:31 +00:00
Martin Storsjö
a1fc29f588 sapenc: Include os_support.h, to provide a fallback definition for socklen_t
Originally committed as revision 25422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-09 09:16:40 +00:00
Aurelien Jacobs
fd0368e7ca move av_find_stream_info() info struct to AVStream to avoid messy (re)allocation
Originally committed as revision 25418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 22:01:19 +00:00
Martin Storsjö
d1f676b8d4 Fix compilation on FreeBSD, use AF_UNSPEC instead of PF_UNSPEC
Originally committed as revision 25416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 18:07:40 +00:00
Martin Storsjö
fcc7f40449 sapenc: Mark the muxer as depending on network functions
Hide all code mentioning IPv6 behind HAVE_STRUCT_SOCKADDR_IN6.

Originally committed as revision 25415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 17:48:13 +00:00
Michael Niedermayer
d03b93e372 Add a space between the else and { in mpegenc.c in the line i added.
Originally committed as revision 25414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 15:41:41 +00:00
Martin Storsjö
011071e717 Add a SAP (Session Announcement Protocol, RFC 2974) muxer
Originally committed as revision 25413 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 12:05:04 +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