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
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
Ronald S. Bultje
7bac991fd9
Reindent after r25032.
...
Originally committed as revision 25033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-03 19:26:27 +00:00
John Wimer
619298a84d
Send NAT punching messages to the address specified in the Transport:
...
message, if available (RFC 2326, section 12.39), fixes issue 2212.
Patch by John Wimer <john at god vtic net>.
Originally committed as revision 25032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-03 19:25:59 +00:00
Martin Storsjö
744a882f6c
rtsp: 10l, try to update the correct rtp stream
...
This fixes a bug from rev 22917. Now RTSP streams where the individual RTCP
sender reports aren't sent at the same time actually are synced properly.
Originally committed as revision 25029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-03 07:10:21 +00:00
Josh Allmann
b20359f51a
rtsp: Return AVERROR_EOF when all streams have received an RTCP BYE packet
...
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 24965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 10:25:16 +00:00
Josh Allmann
a1ba71aace
rtsp: Check the RTCP file handle for new packets, too
...
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 24962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 10:16:54 +00:00
Martin Storsjö
7934b15d5a
Handle IPv6 in the RTSP code
...
Originally committed as revision 24925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 15:32:29 +00:00
Martin Storsjö
3fbd12d109
Handle IPv6 in the SDP demuxer
...
Originally committed as revision 24924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 15:32:00 +00:00
Martin Storsjö
2401660d2f
rtsp: Return EOF if the TCP control channel is closed
...
Originally committed as revision 24920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 13:42:17 +00:00
Ronald S. Bultje
27014bf5a3
Send OPTIONS request at a regular basis to standard RTSP servers as well,
...
this prevents a time-out which closes the TCP connection and kills our
session.
see "Re: [FFmpeg-devel] [PATCH] rtsp.c: keep-alive" thread on mailinglist.
Originally committed as revision 24785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-12 13:39:38 +00:00
Aurelien Jacobs
be73ba2fa4
get rid of MAX_STREAMS limit in RTSP
...
Originally committed as revision 24752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-09 23:00:13 +00:00
Reinhard Tartler
2901cc9a95
Fix spelling in comment(s)
...
Originally committed as revision 24737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 14:11:43 +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
Luca Barbato
d93fdcbf5c
Preserve status reason
...
It is used to provide meaningful error messages.
Originally committed as revision 24714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 10:26:30 +00:00
Martin Storsjö
965a3ddb1f
Remove mostly unnecessary rtpdec_*.h files, store the declarations in one file
...
Originally committed as revision 24596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-30 12:04:27 +00:00
Martin Storsjö
2845006608
rtsp: Move the definition of SDP_MAX_SIZE up, use it in the RTSP muxer, too
...
Originally committed as revision 24571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-28 09:26:15 +00:00
Axel Holzinger
354b757300
Zero-initialize structs/arrays with {0} instead of {}, which isn't proper C99
...
Patch by Axel Holzinger, aholzinger at gmx dot de
Originally committed as revision 24391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 17:27:28 +00:00
Luca Barbato
bf55cf19ca
Report when a method gets an error status code
...
That makes easier understand what went wrong.
In debug mode the whole reply gets printed.
Originally committed as revision 24212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-12 10:17:20 +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
Josh Allmann
ca937a5508
RTSP, rtpdec: Move RTPPayloadData into rtpdec_mpeg4 and remove all references to rtp_payload_data in rtpdec and rtsp
...
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 23772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 08:02:50 +00:00
Josh Allmann
7fc8ac7fd8
RTSP: Move more SDP/FMTP stuff from rtsp.c to rtpdec_mpeg4.c
...
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 23770 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 08:00:05 +00:00
Josh Allmann
9b3788efc3
RTSP: Decouple MPEG-4 and AAC specific parts from rtsp.c
...
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 23769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 07:58:38 +00:00
Josh Allmann
30619e6e59
RTSP: Remove skip_spaces in favor of strspn
...
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 23768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 07:56:45 +00:00
Martin Storsjö
9290f15d00
Make the http protocol open the connection immediately in http_open again
...
Also make the RTSP protocol use url_alloc and url_connect instead of relying
on the delay open behaviour.
Originally committed as revision 23710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 14:15:00 +00:00
Martin Storsjö
a8ead3322f
RTSP: Use the same authentication for the HTTP POST session as for the GET
...
Originally committed as revision 23686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 19:41:02 +00:00
Martin Storsjö
10ed37b5d1
RTSP: Add the auth credentials to the HTTP tunnel URL, too
...
Originally committed as revision 23651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-19 21:57:45 +00:00
Martin Storsjö
6217b6451a
RTSP: Set the connection handles to null after closing them
...
This fixes a potential issue when doing redirects.
Originally committed as revision 23649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-19 21:46:39 +00:00
Josh Allmann
00e4a1f4e2
RTSP: Don't store the connection handles in local variables
...
This removes some useless copying of handles, and simplifies error handling.
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 23648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-19 21:36:13 +00:00
Martin Storsjö
d3f84dfc0e
RTSP: Clean up rtsp_hd on failure
...
Since rtsp_hd isn't assigned to rt->rtsp_hd until after the setup phase,
the initialized URLContext could be leaked on failures.
Originally committed as revision 23643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-18 17:54:56 +00:00
Martin Storsjö
48e77473e9
Cosmetics: Change connexion to connection in code comments
...
Originally committed as revision 23601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 09:09:59 +00:00
Josh Allmann
afcea58c53
RTSP: Shrink SDP fmtp parsing buffer size
...
Since the parsing of Vorbis/Theora fmtp headers is handled by the
parse_sdp_a_line function pointer now, the buffer in sdp_parse_fmtp
doesn't need to be this large any longer.
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 23599 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 08:23:59 +00:00
Josh Allmann
41874d0a5d
Reindent
...
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 23598 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 08:12:40 +00:00
Josh Allmann
f5d33f5241
Add RTSP tunneling over HTTP
...
Patch by Josh Allmann, joshua dot allmann at gmail dot com
Originally committed as revision 23536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 12:40:34 +00:00
Martin Storsjö
fc490fcf71
Cosmetics: Reindent/align/wrap
...
Originally committed as revision 23498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-05 19:49:55 +00:00
Josh Allmann
d0382374b7
RTSP: Propagate errors up from ff_rtsp_send_cmd*
...
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 23497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-05 19:45:46 +00:00
Martin Storsjö
c453d1bb8c
Remove unused local variables
...
Originally committed as revision 23496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-05 19:43:57 +00:00
Josh Allmann
b8c2c41d66
RTSP: Add a second URLContext for outgoing messages
...
Done in preparation for RTSP over HTTP.
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 23494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-05 19:41:43 +00:00
Martin Storsjö
8d168a9207
Fix a crash when opening WMS RTSP streams
...
Fixes issue 1948
Originally committed as revision 23181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-19 09:46:29 +00:00
Stefano Sabatini
2ef6c1242a
Mark av_metadata_set() as deprecated, and use av_metadata_set2()
...
in its place.
av_metadata_set() is going to be dropped at the next major bump.
Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-25 14:27:42 +00:00
Martin Storsjö
5948f82227
Reset RTCP timestamps after seeking, add range start offset to the packets timestamps
...
If these aren't reset, the timestamps make a huge jump when the next RTCP
is received.
Originally committed as revision 22918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 07:38:52 +00:00
Martin Storsjö
2cab6b48ad
Revert svn rev 21857, readd first_rtcp_ntp_time in RTPDemuxContext
...
In order to sync RTP streams that get their initial RTCP timestamp at
different times, propagate the NTP timestamp of the first RTCP packet
to all other streams.
This makes the timestamps of returned packets start at (near) zero instead
of at any random offset.
Originally committed as revision 22917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 07:34:28 +00:00
Ramiro Polla
adef229efb
AVERROR(FF_NETERROR(x)) -> FF_NETERROR(x)
...
FF_NETERROR is implicitly an AVERROR.
Originally committed as revision 22888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-16 00:20:11 +00:00
Ronald S. Bultje
4aecee7fc3
Fix compile error on mingw where ETIMEDOUT is missing (because it's a WSA error).
...
This patch also changes FF_NETERROR() to be an AVERROR(), i.e. it is always
negative, whereas it was previously positive.
Originally committed as revision 22887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-15 18:27:27 +00:00
Martin Storsjö
3370289a4c
Zero-initialize the reply struct
...
The status_code field is read in the fail codepath, where it could be
read uninitialized earlier. Found by clang.
Originally committed as revision 22801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-04 21:59:06 +00:00
Martin Storsjö
0e64218889
Remove a redundant assignment, found by clang
...
Originally committed as revision 22790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-03 12:16:33 +00:00
Sam Gerstein
f3c68c5b45
ETIME -> ETIMEDOUT. Patch by Sam Gerstein <sgerstein bluefinlab com>.
...
Originally committed as revision 22785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 20:14:55 +00:00
Josh Allmann
339f5f3957
Merge Vorbis / Theora depayloaders.
...
Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>.
Originally committed as revision 22768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 21:43:22 +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
Benoit Fouet
32e543f866
Replace @returns by @return.
...
Originally committed as revision 22729 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 15:50:57 +00:00
Reimar Döffinger
c2bfd81605
Some spelling fixes.
...
Originally committed as revision 22720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 19:17:49 +00:00
Sam Gerstein
9cba6f5f40
Add a timeout to the select() call. Patch by Sam Gerstein <sgerstein bluefinlab
...
com>.
Originally committed as revision 22718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 17:36:08 +00:00
Martin Storsjö
4bc5cc2313
Reassemble the RTSP URL before replacing hostname with the numerical IP
...
Originally committed as revision 22681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 22:21:09 +00:00
Martin Storsjö
7b4a36450b
Simplify ff_rtsp_send_cmd_with_content_async, remove an unnecessary buffer
...
Originally committed as revision 22680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 22:04:41 +00:00
Martin Storsjö
30af077942
Don't force basic auth in RTSP, but retry with the server-specified method on failure
...
Originally committed as revision 22678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 21:49:43 +00:00
Martin Storsjö
2626308abb
Actually parse the auth headers in RTSP
...
Originally committed as revision 22677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 21:48:58 +00:00
Martin Storsjö
aa8bf2fb80
Make RTSP use the generic http authentication code
...
Still hardcoded to use Basic auth, without parsing the reply headers
Originally committed as revision 22676 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 21:47:33 +00:00
Martin Storsjö
b17d11c632
Add separate method/url parameters to the rtsp_send_cmd functions
...
Originally committed as revision 22675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 21:46:14 +00:00
Martin Storsjö
e9fea405a7
Reindent
...
Originally committed as revision 22672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 19:47:26 +00:00
Martin Storsjö
b1cc5540e7
Make ff_rtsp_send_cmd simply call ff_rtsp_send_cmd_with_content
...
Originally committed as revision 22663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 23:06:58 +00:00
Luca Barbato
7ed8211b3e
Issue a warning if the received CSeq isn't the expected one
...
Originally committed as revision 22661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 22:38:48 +00:00
Martin Storsjö
3032276b18
Handle errors returned from ff_rtsp_read_reply in udp_read_packet properly
...
Originally committed as revision 22657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 18:52:27 +00:00
Martin Storsjö
7a033e08ea
Handle multiple RTSP transport options properly by adding all of them into the mask
...
Originally committed as revision 22644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 08:00:37 +00:00
Martin Storsjö
602eb77975
Parse options in the RTSP URL only from the last question mark onwards
...
This helps if the URL (erroneously?) contains question marks within the path.
Originally committed as revision 22643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 07:59:23 +00:00
Martin Storsjö
2a21adf924
Reconstruct the RTSP URL, in order to remove the auth part from the URL sent to the server
...
Don't modify the user-specified s->filename at all, keep all modifications
locally and in rt->control_uri.
Originally committed as revision 22642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 07:55:15 +00:00
Martin Storsjö
685e76b554
Reindent
...
Originally committed as revision 22635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 15:07:36 +00:00
Martin Storsjö
b7dc88fc68
Add support for TCP as lower transport in the RTSP muxer
...
Originally committed as revision 22634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 15:07:05 +00:00
Martin Storsjö
6e69f6c47f
Use the caller's RTSPMessageHeader in rtsp_setup_input_streams
...
Currently, the caller doesn't get the status_code and location for rediects,
since rtsp_setup_input_streams uses a copy of RTSPMessageHeader of its own.
Originally committed as revision 22630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 14:42:52 +00:00
Martin Storsjö
ec55edba31
Make rtsp_skip_packet non-static, add ff prefix
...
Originally committed as revision 22547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 16:31:15 +00:00
Martin Storsjö
c040badb70
Reindent
...
Originally committed as revision 22546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 16:15:51 +00:00
Martin Storsjö
c07c6f8183
RTSP: Synchronize the start time of the chained RTP muxers
...
This makes sure that the streams get correctly synchronized when viewed,
previously the streams were out of sync by as much time as it took
between the initialization of the individual muxers.
Originally committed as revision 22545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 14:20:07 +00:00
Aurelien Jacobs
e4a9e3cc7c
move ff_url_split() and ff_url_join() declarations to internal.h
...
those functions are not part of the public API
Originally committed as revision 22534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 23:59:48 +00:00
Martin Storsjö
5c7fd91010
Cosmetics, break a long line, fix brace placement
...
Originally committed as revision 22465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 08:33:04 +00:00
Martin Storsjö
26cb700c82
RTSP muxer: Create the SDP with the numerical IP of the peer
...
instead of using the original host name
Originally committed as revision 22464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 08:24:18 +00:00
Dave Yeo
cbfa66d0cf
Include os_support.h which has a fallback declaration of socklen_t
...
This fixes compilation on some OSes
Patch by Dave Yeo, daveryeo at telus dot net
Originally committed as revision 22426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 07:44:51 +00:00
Martin Storsjö
db76ca7f35
Use rt->control_uri consequently instead of s->filename in all RTSP commands
...
Originally committed as revision 22403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 16:04:41 +00:00
Martin Storsjö
03f8fc0897
RTSP: Resolve and use the actual IP address of the peer we're connected to,
...
instead of using the original host name, since the RTP (and UDP) protocols
may choose another IP address if the host name resolves into several different
addresses.
Originally committed as revision 22398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:59:40 +00:00
Martin Storsjö
f984dcf6dd
Reindent
...
Originally committed as revision 22322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 09:05:03 +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
David Conrad
ac11d562e5
Localize the #define _SVID_SOURCE needed for inet_aton() to os_support.c
...
Originally committed as revision 22284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 19:48:59 +00:00
Martin Storsjö
57b5555c91
Use ff_url_join for assembling URLs, instead of snprintf
...
This ensures proper escaping of numerical IPv6 addresses.
The RTSP (de)muxer needs its own network initialization, since it isn't
a protocol and url_open hasn't been called yet.
Originally committed as revision 22226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 22:35:21 +00:00
Martin Storsjö
f65919af7e
Rename RTP depacketizer files from rtp_* to rtpdec_*
...
Originally committed as revision 22109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 11:03:14 +00:00
Martin Storsjö
9399393333
Cosmetics: reindent
...
Originally committed as revision 21995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 11:05:36 +00:00
Ronald S. Bultje
3307e6ea86
Prefix non-static RTSP functions with ff_.
...
Originally committed as revision 21974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 00:35:50 +00:00
Martin Storsjö
6f5a3d0a7b
Add an RTSP muxer
...
Originally committed as revision 21971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 21:28:19 +00:00
Martin Storsjö
f86f665623
Free metadata in chained RTP muxers in the RTSP muxer
...
This fixes a minor memory leak
Originally committed as revision 21970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 21:20:30 +00:00
Martin Storsjö
af037f8098
Cosmetics: reindent
...
Originally committed as revision 21969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 19:47:22 +00:00
Martin Storsjö
15ba23150e
Add declarations and doxygen documentation of generic rtsp support functions
...
to rtsp.h, and make the functions non-static
Originally committed as revision 21968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 19:44:08 +00:00
Martin Storsjö
2efc97c2fe
Cosmetics: reindent after applying patches
...
Originally committed as revision 21967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 16:11:38 +00:00
Martin Storsjö
35cfd6464e
Don't follow RTSP redirects when used as a muxer
...
Originally committed as revision 21966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 15:57:40 +00:00
Martin Storsjö
3e24c7701c
Add a function rtsp_setup_output_streams for announcing the SDP
...
and setting up the internal RTSPStream data structures when using
the RTSP code in muxer mode.
Originally committed as revision 21965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 15:56:18 +00:00
Martin Storsjö
fd450a5177
Create AVFormatContext objects as private transport for output RTSP sessions
...
Originally committed as revision 21964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 15:46:56 +00:00
Martin Storsjö
4280f9bbcd
Split rtsp_read_header() into two functions, so that the main part (now also
...
known as rtsp_connect()) can be used in the RTSP muxer.
Patch by Martin Storsjö <$firstname $firstname st>.
Originally committed as revision 21915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:23:40 +00:00
Martin Storsjö
e23d195deb
Split out input-specific parts of rtsp_read_header() into its own, new,
...
function (rtsp_setup_input_streams()), as preparation for the upcoming
RTSP muxer.
Patch by Martin Storsjö <$firstname $firstname st>.
Originally committed as revision 21914 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:21:44 +00:00
Martin Storsjö
30ff7c5cbc
Only send out NAT-punching RTP/RTCP packets when we're in demuxer mode, i.e.
...
don't send them when acting as a RTSP muxer.
Patch by Martin Storsjö <$firstname $firstname st>.
Originally committed as revision 21913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:13:21 +00:00
Martin Storsjö
69adcc4ffb
Use mode=receive instead of mode=play if in RTSP muxer (instead of demuxer)
...
mode.
Patch by Martin Storsjö <$firstname $firstname st>.
Originally committed as revision 21912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:11:59 +00:00
Martin Storsjö
52aa4338cc
Make rtsp_close_streams() take a AVFormatContext instead of a RTSPState
...
argument, so we can use AVFormatContext->* here in the future.
Patch by Martin Storsjö <$firstname $firstname st>.
Originally committed as revision 21911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:10:19 +00:00