Michael Chinen
27d97fded3
Fix ffplay to keep calling av_read_frame even if EOF has been reached.
...
Patch by Michael Chinen, mchinen gmail
Originally committed as revision 25426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-09 17:50:17 +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ö
2aab70c476
sapenc: Declare a dependency on rtp_protocol, too
...
The SAP muxer uses network functions directly, uses the rtp protocol and the
udp protocol. The network functions and the udp protocol are both transitively
enabled via the rtp protocol, so that's the only dependency that needs to
be stated.
Originally committed as revision 25423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-09 09:29:29 +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
Stefano Sabatini
adbb9bcaa7
s/program/programs, as FFmpeg consists of many programs.
...
Originally committed as revision 25421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 23:45:06 +00:00
Stefano Sabatini
4ddade62dd
Install libavutil/opt.h, its API is public.
...
Fix issue #2265 .
Originally committed as revision 25420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 23:42:25 +00:00
Stefano Sabatini
74d127b537
Add validity checks for the unsharp filter.
...
Prevent crash.
Originally committed as revision 25419 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 23:36:35 +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
Michael Niedermayer
f47d172f13
Check for more 'indent -kr' whitespace details.
...
Originally committed as revision 25417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 19:11:36 +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ö
6ded3a0411
Fix headers so that "make checkheaders" passes again
...
Originally committed as revision 25411 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 08:56:36 +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ö
f6833fc1c6
Add protocol documentation on the connect option to the udp protocol
...
Originally committed as revision 25407 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 08:49:56 +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
a7ba165a0c
Update gxf regression tests because of r25399
...
Originally committed as revision 25400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 19:37:37 +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
Aurelien Jacobs
ca8064d2d1
fix bitstream filter option mapping when using -newvideo and friends
...
There was an off-by-one when addressing bitstream_filters[] in this situation.
Originally committed as revision 25398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 19:25:48 +00:00
Reimar Döffinger
6c2142809c
Add d modifier to asm argument to fix nasm compilation.
...
Originally committed as revision 25397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 19:18:18 +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ö
0de7feffcf
Set myself as maintainer for rtpenc* and sdp.c, as requested by Luca A
...
Originally committed as revision 25392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 11:18:16 +00:00
Rafaël Carré
9b9d3868d5
libmp3lame: don't check unused function in detection
...
hip_decode_init() isn't used by the wrapper, and can be absent from the
library if lame was configured with --disable-decoder (like it is done
for windows builds of VLC)
Unfortunately this also removes the way to detect a libmp3lame more recent
than the buggy 3.98.2
Patch by Rafaël Carré, rafael carre at gmail
Originally committed as revision 25391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 08:38:39 +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
2dec2bb880
Pass RC parameters on stream copy to the muxer.
...
Originally committed as revision 25384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 01:57:35 +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
Aurelien Jacobs
1136850dd5
cosmetic: break long line
...
Originally committed as revision 25377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-06 18:54:10 +00:00