virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
26,946 Commits 37 Branches 400 Tags 465 MiB
91cbb6ba53
Commit Graph

6714 Commits

Author SHA1 Message Date
Martin Storsjö
47bfe49c64 rtsp: Add stub declarations of the setup_in/output_streams functions 
This may be needed to avoid calls to implicitly defined functions
(that will be removed by dead code elimination later anyway).

Originally committed as revision 25585 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-27 00:42:35 +00:00
Anton Khirnov
c55f891c2f nutdec: when parsing info packet, set metadata var only once 
Originally committed as revision 25558 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-24 07:28:04 +00:00
Aurelien Jacobs
a5cea13202 drop rtsp_default_protocols which is not part of public API and not used anymore 
Originally committed as revision 25557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 16:22:36 +00:00
Aurelien Jacobs
a178edf298 drop rtp_get_file_handles() which is not part of public API and not used anymore 
Originally committed as revision 25556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 16:21:49 +00:00
Aurelien Jacobs
fb660f4015 drop rtp_get_local_port() which is not part of public API and not used anymore 
Originally committed as revision 25555 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 16:20:56 +00:00
Aurelien Jacobs
67f34aaa97 use rtp_get_local_rtp_port() instead of the deprecated rtp_get_local_port() 
Originally committed as revision 25554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 16:19:53 +00:00
Pascal Massimino
85f56757b4 cosmetics: align fields, and remove useless ones, in img2.c 
Originally committed as revision 25539 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-21 22:07:00 +00:00
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
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
Reuben Martin
ad4c3c6840 In gxf muxer, fix flt entry offset, patch by Reuben Martin, reuben dot m at gmail dot com 
Originally committed as revision 25395 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:15:35 +00:00
Aurelien Jacobs
e99179de9b remove useless local variable 
Originally committed as revision 25394 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:10:51 +00:00
Aurelien Jacobs
3e4318bf4a remove useless local allocated start_time array 
Originally committed as revision 25393 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:05:31 +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ö
55b6bd1c01 Convert ff_is_multicast_address to take a struct sockaddr parameter 
Not all users of this function will have a full struct sockaddr_storage
available, and casting other sockaddrs to sockaddr_storage is wrong,
while any sockaddr can be cast to a base sockaddr.

Originally committed as revision 25388 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 07:58:56 +00:00
Martin Storsjö
7ac57fa5eb Share the is_multicast_address function 
The header probably isn't the right permanent place for this function, but
it is quite small, and consensus seems to be that it can stay in the
header for now, instead of creating a new file network.c just for this one.

Originally committed as revision 25387 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 07:54:52 +00:00
Martin Storsjö
f63630cdf3 Move multicast address identification fallback macros to network.h from udp.c 
Originally committed as revision 25386 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 07:53:31 +00:00
Michael Niedermayer
34b9e5bc4f Warn if muxing mpeg ps is attempted without a VBV buffer size. 
Originally committed as revision 25385 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 01:57:39 +00:00
Michael Niedermayer
9b272e3274 Init SCR in mpeg muxer based on first DTS. 
This fixes issues if the first DTS is far away from 0.

Originally committed as revision 25383 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 00:32:22 +00:00
Aurelien Jacobs
61138c43e0 properly check for FF_API_MAX_STREAMS instead of LIBAVFORMAT_VERSION_MAJOR 
Originally committed as revision 25382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 21:43:46 +00:00
Aurelien Jacobs
38aab35f47 add new streams API without MAX_STREAMS limit 
(disabled until next major bump)

Originally committed as revision 25381 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:56:14 +00:00
Aurelien Jacobs
feb2440c38 dynamically use nb_streams instead of static use of MAX_STREAMS 
Originally committed as revision 25380 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:52:26 +00:00
Aurelien Jacobs
2899a28cdc document the fact that av_new_stream() can't be called in a background thread 
Originally committed as revision 25379 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:49:25 +00:00
Reimar Döffinger
6612d8cf31 Move handling of ID3v2 to common utils.c code, reducing code duplication 
and supporting it for more formats, fixing issue 2258.

Originally committed as revision 25378 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:21:07 +00:00
Stefano Sabatini
85c15960b4 Move the definitions of AVSEEK_SIZE to make it appear before the 
description of url_seek(), which references it.

Originally committed as revision 25376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 18:42:46 +00:00
Robert Schlabbach
9446b4bbbc rtpdec: Handle RTP header extension 
This fixes roundup issue 2270.

Patch by Robert Schlabbach, robert_s at gmx dot net

Originally committed as revision 25372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 16:59:14 +00:00
Martin Storsjö
3ece3e4c56 Add RTP depacketization of the X-QT QuickTime format 
Originally committed as revision 25371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 12:42:18 +00:00
Carl Eugen Hoyos
0ada32c373 Remove unused variable. 
Originally committed as revision 25369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 11:40:09 +00:00
Michael Niedermayer
fe5feaeb76 Use retry_transfer_wrapper() in url_write() as its callers do not expect it to stop in the middle. 
Originally committed as revision 25368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 11:18:43 +00:00
Michael Niedermayer
a46f7516ec Factor retry_transfer_wrapper() out of url_read_complete() 
Originally committed as revision 25367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 11:18:38 +00:00
Martin Storsjö
2f412421e8 movdec: Free the previous extradata 
If multiple stsd atoms are parsed for the same stream, the old
extradata would be leaked.

Originally committed as revision 25360 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 21:36:30 +00:00
Martin Storsjö
dc2cabd003 movdec: Split out ff_mov_read_stsd 
Originally committed as revision 25359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 21:35:44 +00:00
Anton Khirnov
ec4913a8ae vorbiscomment: add DISCNUMBER to the metadata conv table 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25357 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 20:11:07 +00:00
Martin Storsjö
5fe8021a6a rtsp/sdp: Move code into correct ifdefs 
This makes the code dependencies correct. Previously, the SDP demuxer
wasn't buildable on its own.

This also reverts rev 25343.

Originally committed as revision 25354 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 19:46:25 +00:00
Martin Storsjö
eb99f179fa find_info_tag: Make sure the output buffer is null terminated 
Originally committed as revision 25353 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 19:33:56 +00:00
Martin Storsjö
5961253463 udp: Define _DARWIN_C_SOURCE 
This is required in order to get the IP_MULTICAST_TTL define.

Originally committed as revision 25351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 16:35:33 +00:00
Martin Storsjö
25a2ebb917 udp: Return the actual error code on errors, instead of AVERROR(EIO) 
Originally committed as revision 25350 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 14:09:30 +00:00
qrtt1
42f9582d8d Set proper error if server flags indicate that it doesn't support mmst. This 
prevents a read-after-close-induced segfault later. Fixes issue 2266.

Patch by qrtt1 <chingyichan dot tw gmail com>.

Originally committed as revision 25349 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 14:04:46 +00:00
Tobias Bindhammer
2a26520a97 Cosmetics, lots of. 
Originally committed as revision 25348 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 12:14:30 +00:00
Diego Biurrun
a44da176ac Remove some pointless CONFIG_RTSP_DEMUXER #ifdefs. 
They reside within a large CONFIG_RTSP_DEMUXER block and are thus pointless.

Originally committed as revision 25343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 11:06:32 +00:00
Diego Biurrun
2e802e3855 Add some #endif comments to ease understanding. 
Originally committed as revision 25342 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 11:03:48 +00:00
Anton Khirnov
9b75309c19 matroskaenc: write metadata 
patch by Anton Khirnov   anton _at_ khirnov _dot_ net

Originally committed as revision 25341 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 09:40:43 +00:00
Baptiste Coudurier
c9b8762856 xdcam hd422 720p24 fourcc in mov 
Originally committed as revision 25336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-04 20:23:36 +00:00
Aurelien Jacobs
0f02a7e2d2 mms: remove dependency on MAX_STREAM API 
Originally committed as revision 25335 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-04 19:45:12 +00:00
Martin Storsjö
7fe3c270c0 rtpdec_svq3: Don't look for the unused RTP_FLAG_KEY flag 
Originally committed as revision 25327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 18:55:46 +00:00
Martin Storsjö
d7810f4541 rtsp: In the muxer, show the generated with verbose log level 
It is only useful for debugging, so it doesn't have to be shown every time.

Originally committed as revision 25323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 11:56:38 +00:00
Martin Storsjö
6ecd741713 rtsp: Show the received SDP 
Originally committed as revision 25322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 11:55:16 +00:00
Benjamin Larsson
62784e3733 Add the CODEC_CAP_CHANNEL_CONF capability code and add 
that flag to the dca codec. This capability when set
will make sure the codec will initialize the channel
configuration instead of trusting the container. This
fixes issue 2137 and issue 850.

Originally committed as revision 25320 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 22:18:02 +00:00
Martin Storsjö
ae8c28db87 applehttp: Add comments to make_absolute_url 
Originally committed as revision 25319 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 21:59:16 +00:00
Martin Storsjö
9d229ef9e6 applehttp: Handle a .. path segment in the base url 
Originally committed as revision 25318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 21:58:36 +00:00
Martin Storsjö
978a5ce82e Reindent 
Originally committed as revision 25317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 21:58:13 +00:00
Martin Storsjö
8f7c2452de applehttp: Allow the base url to be a local file name, too 
Originally committed as revision 25316 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 21:57:58 +00:00
Stefano Sabatini
8bf256bcc0 Document url_get_filename(). 
Originally committed as revision 25310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 09:16:52 +00:00
Aurelien Jacobs
dba249abee ffmpeg: add a grow_array() helper function 
Originally committed as revision 25297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:29:37 +00:00
Martin Storsjö
321259c1ab rtsp: Return a queued packet if it has been in the queue for longer than max_delay 
Originally committed as revision 25295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:52:26 +00:00
Martin Storsjö
58ee09911e rtpdec: Reorder received RTP packets according to the seq number 
Reordering is enabled only when receiving over UDP.

Originally committed as revision 25294 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:50:24 +00:00
Martin Storsjö
0260741876 rtpdec: Split out the part of rtp_parse_packet that does the parsing of new packets 
Originally committed as revision 25293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:46:10 +00:00
Reimar Döffinger
27af8902c4 Fix indentation of ff_id3v2_read 
Originally committed as revision 25292 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:45:18 +00:00
Martin Storsjö
c690fa97e5 Reindent/rewrap 
Originally committed as revision 25291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:44:53 +00:00
Martin Storsjö
38f8c80b62 rtsp: Reorganize if statements in rtsp_read_play 
Originally committed as revision 25290 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:44:18 +00:00
Martin Storsjö
ad4ad27fb6 rtsp/rtpdec: Allow rtp_parse_packet to take ownership of the packet buffer 
Do the same change for ff_rdt_parse_packet, too, to keep the interfaces
similar.

Originally committed as revision 25289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:43:27 +00:00
Martin Storsjö
96a7c9753e rtsp: Use a dynamically allocated receive buffer 
Originally committed as revision 25288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:41:31 +00:00
Tomas Härdin
8878e3b21b Add demuxer for LXF (Leitch/Harris' VR native stream format) 
Originally committed as revision 25281 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 11:08:24 +00:00
Baptiste Coudurier
d8e456400e Correct tag is m2v1 
Originally committed as revision 25271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-30 18:12:27 +00:00
Stefano Sabatini
f3f5eb6e70 Document url_filesize(). 
Originally committed as revision 25268 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-30 10:55:08 +00:00
Stefano Sabatini
0a216bd1dd Make register_protocol() use the function av_register_protocol2() 
rather than av_register_protocol(), which is deprecated.
Fix the GCC warning:
avio.c: In function ‘register_protocol’:
avio.c:93: warning: ‘av_register_protocol’ is deprecated (declared at avio.c:86)

Originally committed as revision 25267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-30 10:51:22 +00:00
Baptiste Coudurier
826481ea91 Remove duplicate entries 
Originally committed as revision 25264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-29 21:35:52 +00:00
Baptiste Coudurier
3432c26319 Use new apple fourcc for mpeg-1 and mpeg-2 in mov, works natively on osx 
Originally committed as revision 25263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-29 21:34:31 +00:00
Ronald S. Bultje
3dedbeff7b Check return value of get_chunk_header(). Since enum can be unsigned, the 
current code wouldn't always error out on errors.

Based on patch by Stephen d'Angelo <sdangelo evertz com>.

Originally committed as revision 25260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-29 15:43:36 +00:00
Baptiste Coudurier
6d19fd5c26 In mov demuxer, check that nb_streams is valid before using it in read_dac3 
Originally committed as revision 25240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-28 00:33:21 +00:00
Michael Chinen
59cb40b921 Fix index_entries pos: 
It was being set wrong for files with data_offset > 0

Patch by Michael Chinen, mchinen gmail

Originally committed as revision 25239 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 22:17:58 +00:00
Martin Storsjö
4a94cfea02 rtpproto: Use a sockaddr_storage instead of a sockaddr_in with recvfrom 
Originally committed as revision 25224 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 16:10:23 +00:00
Tomas Härdin
1620939022 mpegtsenc: Indent 
Originally committed as revision 25222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 12:27:26 +00:00
Tomas Härdin
d1ac03517e mpegtsenc: Write subtitle extradata if set 
Originally committed as revision 25221 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 12:27:23 +00:00
Michael Niedermayer
6ed040408b Move AVOptions from libavcodec to libavutil 
Originally committed as revision 25210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-26 14:25:22 +00:00
Kostya Shishkov
cba322d76d Make WMV3 decoder attempt to decode WMVP as well 
Originally committed as revision 25209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-26 13:56:50 +00:00
Stefano Sabatini
b9f9e59afc Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the 
corresponding AVMEDIA_TYPE_* symbols.

Originally committed as revision 25201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-25 23:27:16 +00:00
Martin Storsjö
6df4029549 Add an AVOption max_delay for AVFormatContext->max_delay 
This can currently also be set via -muxdelay in ffmpeg for muxers,
but not for demuxers (nor for demuxers in ffplay) - this patch
allows it to be set in all those cases.

Originally committed as revision 25180 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 18:04:21 +00:00
Carl Eugen Hoyos
b7d56a17ae Fix indentation after r25158. 
Originally committed as revision 25160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-23 09:53:26 +00:00
Richard Buteau
6ac6e3d123 Fix aspect ratio for files that have it stored in 
ff_asf_extended_content_header.
Fixes issue 690.

Patch by Richard Buteau, rbuteau rgbnetworks com

Originally committed as revision 25158 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-23 03:40:06 +00:00
Diego Biurrun
26d5112c57 cosmetics: Place concat protocol entry in alphabetical order. 
Originally committed as revision 25155 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-21 22:21:12 +00:00
Martin Storsjö
b416267622 tcp: Check both wfds and efds when waiting for the result from connect 
On windows, a connection failure doesn't trigger wfds as it does on unix.

This fixes issue 2237, based on code by yeyingxian.

Originally committed as revision 25154 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-21 20:17:34 +00:00
Martin Storsjö
63206a8ffb Check for the IPPROTO_IPV6 define before using it 
This fixes building on FreeBSD in some configurations, if the IPv6 multicast
structs are available, but IPPROTO_IPV6 isn't defined.

Originally committed as revision 25147 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-20 06:38:40 +00:00
Martin Storsjö
160918d588 rtsp: Handle standard assigned codec names for private payload types, too 
Originally committed as revision 25126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-15 17:39:25 +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
Michael Niedermayer
4faf628f20 Clarify what av_read_frame() returns. 
Originally committed as revision 25123 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-14 22:20:46 +00:00
Zhou Zongyi
4383692896 Add R10k decoder. 
Original patch by Zhou Zongyi, zhouzy A os pku edu cn, resubmitted by
James Darnley, james.darnley gmail, changes by me.

Originally committed as revision 25115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-13 22:08:51 +00:00
David Byron
0c41d554e2 Read all id3v2 tags at the beginning of mp3 files. 
Patch by David Byron, dbyron dbyron com

Originally committed as revision 25105 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-11 16:29:23 +00:00
Tomás Touceda
16f825085a FLV Metadata 
Patch by Tomás Touceda, chiiph gentoo org

Originally committed as revision 25101 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-10 23:29:07 +00:00
Måns Rullgård
324d22b2b4 nutenc: fix unstable floating-point calculations 
Originally committed as revision 25095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-10 13:16:08 +00:00
Alex Converse
20de72a447 adts demuxer: Set the time base to be the LCM of all ADTS sample rates. 
Originally committed as revision 25091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-09 23:15:17 +00:00