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
Martin Storsjö
a493f80a2c
rtsp: Factorize out code for opening a chained RTP muxer
...
The new object file is added to the SDP demuxer in the makefile, since it
is needed in both the RTSP muxer and demuxer and in the SDP demuxer, due
to the current code coupling.
Originally committed as revision 25410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 08:54:53 +00:00
Martin Storsjö
3d74223025
rtsp: Make rtsp_rtp_mux_open reusable
...
Originally committed as revision 25409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 08:51:05 +00:00
Martin Storsjö
9e6acc7884
rtsp: Remove the start_time field from RTSPState, use AVFormatContext->start_time_realtime instead
...
Originally committed as revision 25408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 08:50:29 +00:00
Martin Storsjö
25968c3953
Reindent
...
Originally committed as revision 25406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 08:43:10 +00:00
Martin Storsjö
6766a354f7
udp: Add an option for connecting the udp socket
...
This allows us to find out the local sending address via getsockname,
otherwise we just get INADDR_ANY (or similar for v6).
This also makes writes return ECONNREFUSED if nobody is listening on the
receiving port.
Originally committed as revision 25405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 08:42:30 +00:00
Martin Storsjö
b7952ed184
rtpdec: Set prev_ret properly when parsing more data from mpegts RTP packets
...
Originally committed as revision 25404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 08:40:08 +00:00
Martin Storsjö
45658b7414
rtpdec: Store the previous return value for mpegts when it was -1, too
...
Originally committed as revision 25403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 07:28:17 +00:00
Robert Schlabbach
243ac3fdaa
rtpdec: Keep track of the previous return value from rtp_parse_packet_internal for mpegts packets
...
Patch by Robert Schlabbach, robert_s at gmx dot net
Originally committed as revision 25402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 07:26:42 +00:00
Baptiste Coudurier
8a451afe7d
In gxf muxer, round up number of lines mod 16 in mpeg umf data, based patch by Reuben Martin, reuben dot m at gmail dot com
...
Originally committed as revision 25401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 19:41:04 +00:00
Baptiste Coudurier
c6d04addf6
In gxf muxer, fix number of flt entries based on patch by Reuben Martin, reuben dot m at gmail dot com
...
Originally committed as revision 25399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 19:35:55 +00:00
Reuben Martin
82ae56b3fa
In gxf muxer, write umf media for mpeg1video, patch by Reuben Martin, reuben dot m at gmail dot com
...
Originally committed as revision 25396 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 19:17:06 +00:00