har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,213 Commits 2 Branches 401 Tags
Commit Graph

44 Commits

Author SHA1 Message Date
Gabriel Dume
f929ab0569 cosmetics: Write NULL pointer equality checks more compactly 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-15 03:18:18 -07:00
Martin Storsjö
50aef03b24 rtspenc: Make sure BYE packets are sent before TEARDOWN 
Also make sure the BYE packets are sent at all when using
TCP interleaved transport.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-01 09:57:06 +02:00
Martin Storsjö
f542dedf72 rtspenc: Check the return value from ffio_open_dyn_packet_buf 
Also clear the AVIOContext handle after freeing, to avoid
possible dangling pointers if the later call fails.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-07 11:37:01 +03:00
Anton Khirnov
36ef5369ee Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
Diego Biurrun
6774247a9d avformat: Drop pointless "format" from container long names 2012-07-30 13:59:06 +02:00
Anton Khirnov
c4ef6a3e4b Add missing libavutil/time.h includes. 2012-07-28 09:02:07 +02:00
Mans Rullgard
6501dcfb5e Remove unnecessary inclusions of [sys/]time.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-06-20 11:46:46 +01:00
Martin Storsjö
17934c1824 cosmetics: Align some AVInput/OutputFormat declarations 
Also add missing trailing commas.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-19 14:27:43 +02:00
Martin Storsjö
298a587f44 rtp: Factorize the check for distinguishing RTCP packets from RTP 
The binary doesn't change after this patch.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-16 17:45:33 +01:00
Alex Converse
7181c4edee cosmetics: Remove extra newlines at EOF 2012-01-27 17:19:09 -08:00
Martin Storsjö
17fff881e7 rtsp: Merge the AVOption lists 
This eases adding options that are common for both. The
AV_OPT_FLAG_EN/DECODING_PARAM still indicates whether they belong
to the muxer or demuxer.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-10-17 19:57:45 +03:00
Anton Khirnov
dfc2c4d900 lavf: use designated initialisers for all (de)muxers. 
It's more readable and less prone to breakage.
 2011-07-17 06:58:37 +02:00
Martin Storsjö
e2e29c6247 rtspenc: Add RTP muxer options 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:52:22 +03:00
Martin Storsjö
6cf09bb7ef rtspenc: Add an AVClass for setting muxer specific options 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:50:41 +03:00
Anton Khirnov
c3675dfe1e lavf: rename avf_sdp_create to av_sdp_create. 
The new name is more consistent with the rest of the API.
 2011-04-08 16:45:40 +02:00
Anton Khirnov
1869ea03b7 avio: make url_get_file_handle() internal. 2011-04-04 17:45:20 +02:00
Anton Khirnov
925e908bc7 avio: make url_write() internal. 2011-04-04 17:45:20 +02:00
Anton Khirnov
403ee835e7 avio: make url_open_dyn_packet_buf internal. 
It doesn't look fit to be a part of the public API.

Adding a temporary hack to ffserver to be able to use it, should be
cleaned up when somebody is up for it.
 2011-04-03 22:47:32 +02:00
Anton Khirnov
6dc7d80de7 avio: avio_ prefix for url_close_dyn_buf 2011-04-03 22:47:05 +02:00
Martin Storsjö
28e9c42afb rtsp: Don't use a locale dependent format string 
In this particular case, we aren't ever printing anything else than
0.000 anyway.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-23 07:30:16 -04:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Martin Storsjö
d9c0510e22 rtsp: Don't store RTSPStream in AVStream->priv_data 
For mpegts in RTP, there isn't a direct mapping between RTSPStreams
and AVStreams, and the RTSPStream isn't ever stored in
AVStream->priv_data, which was earlier leaked. The fix for this
leak, in ea7f080749d68a431226ce196014da38761a0d82, lead to
double frees for other, normal RTP streams.

This patch avoids storing RTSPStreams in AVStream->priv_data, thus
avoiding the double free. The RTSPStreams are always available via
RTSPState->rtsp_streams anyway.

Tested with MS-RTSP, RealRTSP, DSS and mpegts/RTP.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-02-03 00:49:15 +01:00
Dave Yeo
a0788cc627 rtspenc: include os_support.h for system without HAVE_POLL_H 
fix compile on OS/2

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 21:41:12 +01:00
Luca Barbato
a8475bbdb6 os: replace select with poll 
Select has limitations on the fd values it could accept and silently
breaks when it is reached.
 2011-01-28 15:45:19 +01:00
Diego Elio Pettenò
c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
 2011-01-26 22:10:09 +00:00
Martin Storsjö
3df54c6bf2 rtsp: Add a method parameter to ff_rtsp_read_reply 
Originally committed as revision 26189 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:06:21 +00:00
Martin Storsjö
c2688f3ac8 rtsp: Move rtsp_setup_output_streams into rtspenc.c 
Originally committed as revision 25600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-29 08:41:49 +00:00
Josh Allmann
7f3468d392 rtp: Replace hardcoded RTCP packet types with defines 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 09:15:31 +00:00
Martin Storsjö
76d908b3fe Include lavu headers using quotes instead of angle brackets 
Originally committed as revision 24315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-18 20:30:33 +00:00
Martin Storsjö
a26c3c211e Make the RTSP muxer use rtsp_hd_out, for consistency 
Originally committed as revision 23535 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-08 12:26:51 +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ö
35d8ecc54e rtspenc: Write the interleaving header in the same buffer as the packet data 
Originally committed as revision 23465 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-04 06:42:39 +00:00
Martin Storsjö
38d4a21778 Change the default codecs for the rtsp muxer to mpeg4 and aac 
These codecs in RTP are supported by many players.

Originally committed as revision 23209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-21 07:12:33 +00:00
Martin Storsjö
648e41b342 Take ff_write_chained in use in the mov rtp hinter and in the rtsp muxer 
Originally committed as revision 23208 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-21 07:08:29 +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ö
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ö
db128802c5 Reindent 
Originally committed as revision 22549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 16:36:54 +00:00
Martin Storsjö
ad2ae6dbaf Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet. 
Skip interleaved packets manually and recheck if there's more to be read.

Originally committed as revision 22548 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 16:36:20 +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ö
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ö
50ff78db01 RTSP muxer: Use a local copy of the AVPacket for sending to the chained muxer 
This way, we avoid overwriting stream_index in the user's AVPacket
with a nonsense value.

Originally committed as revision 22081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-26 16:21:56 +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