1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Commit Graph

66 Commits

Author SHA1 Message Date
Luca Barbato
5ee0e1395d use FF_NETERROR to make winsock happy, patch from prossATxvidDoTorg
Originally committed as revision 12678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-03 22:15:16 +00:00
Ronald S. Bultje
7e6ca34f27 Reindent after rtsp-alternate-protocol* patches.
Originally committed as revision 12506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-19 14:08:16 +00:00
Ronald S. Bultje
8792f52a9b Change protocol_mask into protocol, since we always just try a single one per
iteration in make_setup_request(), and cycling between the different protocols
is now done in the calling function, therefore the need for a mask goes away.
This also makes the function somewhat simpler to read.

Discussed and approved in "[PATCH] RTSP alternate protocol 3/4".

Originally committed as revision 12505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-19 14:07:31 +00:00
Ronald S. Bultje
8a8754d80f Allow cycling between different protocols (TCP, UDP or multicast) so that if
one doesn't work, we can try the next one (i.e. trial-error protocol auto-
probing).

Discussed and approved in "[PATCH] RTSP alternate protocol 2-3/3".

Originally committed as revision 12504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-19 14:05:08 +00:00
Ronald S. Bultje
53620bba51 Split the SETUP request into a separate function, as a prelude into allowing
multiple SETUPs to be send to cycle protocols rather than bailing if one
fails.

Discussed and approved in "[PATCH] RTSP alternate protocol 1/3".

Originally committed as revision 12476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-17 12:16:39 +00:00
Ronald S. Bultje
c482500fa3 Drop RTSP default protocol.
patch by Ronald S. Bultje, rsbultje gmail com

Originally committed as revision 11377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-02 19:40:43 +00:00
Luca Barbato
7ecc634e8a Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 3 Reindent
Originally committed as revision 11341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-28 11:25:25 +00:00
Luca Barbato
e150211863 Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 2 x-pn-tng support
Originally committed as revision 11340 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-28 11:23:25 +00:00
Luca Barbato
16ed032214 Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 1 Comment
Originally committed as revision 11339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-28 11:10:17 +00:00
Luca Abeni
e8acf0edea Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
and implement the redirector format more properly.

Originally committed as revision 11112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-29 08:35:05 +00:00
Luca Barbato
489b0d4d98 Make av_read_frame with rtsp client return EINTR on interrupt
patch from elupusateccedotse (missing hunk from r11072)

Originally committed as revision 11076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-22 14:13:23 +00:00
Luca Barbato
a960a1e041 Make av_read_frame with rtsp client return EINTR on interrupt
patch from elupusateccedotse

Originally committed as revision 11072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 10:26:11 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Luca Abeni
7ed19d7fbf Remove the "AVRtpPayloadTypes[i].pt == i" assumption from RTP and RTSP
code (this is needed for supporting MPEG2 video in the RTP muxer)

Originally committed as revision 11046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-16 07:59:41 +00:00
Ronald S. Bultje
b316aa1a1e Specify the server address when opening an rtp:// URL in rtsp.c, so
that the correct local address can be used for binding the socket.
Fixes rtsp:// URLs in ffplay on MacOS X

Patch by Ronald Bultje (rsbultje at gmail dot com)

Originally committed as revision 10940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-07 14:20:40 +00:00
Luca Abeni
ecdcbbf66a If local port n is not available, try n + 2 instead of continuing to bind
on n (allow to receive 2 rtsp streams simultaneously with libavformat)

Originally committed as revision 10876 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 08:10:45 +00:00
Luca Abeni
c971ff1977 Remove the inclusion of rtsp.h and rtp.h from avformat.h, and
explicitly include such headers where needed

Originally committed as revision 10871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-29 09:15:35 +00:00
Luca Abeni
50755217f8 Use correct timescale in RTSP seeking
Originally committed as revision 10222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-25 15:12:38 +00:00
Panagiotis Issaris
6f3e0b2174 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 15:23:32 +00:00
Panagiotis Issaris
769e10f068 Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
Originally committed as revision 9759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 15:21:30 +00:00
Alex Beregszaszi
e2e2e7dd70 .memleak fix by Ronald Bultje. OK'd by Luca.
Originally committed as revision 9697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-16 10:56:40 +00:00
Luca Barbato
d02678eccc rtsp multicast fix by Thijs Vermeir $1$2@gmail.com
Originally committed as revision 9611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-12 21:12:33 +00:00
Ronald S. Bultje
80fb82346e Use AV_RB* macros where appropriate.
patch by Ronald S. Bultje, rsbultje gmail com
thread: Re: [FFmpeg-devel] remove int readers
date: Sat, 23 Jun 2007 09:32:12 -0400

Originally committed as revision 9499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-06 09:32:34 +00:00
Eric Paul
74ef8b434d check udp_read_packet return value not to access uninitialized memory
patch by Eric Paul: [eric paul gmail com]
original thread: [FFmpeg-devel] [PATCH] : libavformat segfault when a
RTSP reading is interrupted
date: 07/05/2007 03:13 PM

Originally committed as revision 9492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 20:58:34 +00:00
Måns Rullgård
f7d78f3654 replace the uses of old string functions that Reimar missed
Originally committed as revision 9406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-24 11:27:12 +00:00
Måns Rullgård
75e61b0e88 use new string functions
based on patch by Reimar Döffinger

Originally committed as revision 9401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-23 23:10:32 +00:00
Thijs Vermeir
8bd32c0424 Add transport method options
patch by Thijs Vermeir thijs vermeir chez barco com
original thread:
[FFmpeg-devel] [PATCH] Add rtsp options support ( added option)

Originally committed as revision 9099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-22 07:51:39 +00:00
Thijs Vermeir
badc9ae2d5 Add support for options
patch by Thijs Vermeir thijs vermeir chez barco com
original thread:
[FFmpeg-devel] [PATCH] Add rtsp options support ( added option)

Originally committed as revision 9098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-22 07:47:04 +00:00
Alex Beregszaszi
9686292664 Don't compile RTSP_DEMUXER if not requested
Originally committed as revision 8841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 23:41:20 +00:00
Alex Beregszaszi
e7047005cb properly compile code for REDIR_DEMUXER
Originally committed as revision 8840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 23:40:36 +00:00
Alex Beregszaszi
0913873e5b remove unused rtsp_callback
Originally committed as revision 8832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 17:38:30 +00:00
Panagiotis Issaris
0af4407d35 Move unaltered rtsp.c comments to the header file.
Originally committed as revision 8256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-05 13:53:42 +00:00
Marc Hoffman
db0ed93e22 Fix compilation on Mac OS X, patch by Marc Hoffman, mmh pleasantst com.
Originally committed as revision 8067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-22 08:40:33 +00:00
Ramiro Polla
42572ef53f move networking #includes into separate file
patch by Ramiro Polla angustia =a= arrozcru =d= no-ip =d= org

Originally committed as revision 7817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-04 17:05:44 +00:00
François Revol
e9d511dc7e The long awaited BeOS cleanup, phase 1
Originally committed as revision 7581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-18 17:22:30 +00:00
Ryan Martell
1ad20f96f2 remove duplicate code, patch by Ryan Martell rdm4 A martellventures P com
Original thread:
Date: 11/15/2006 05:15 PM
Subject: [Ffmpeg-devel] [PATCH] rtsp.c minor cleanup

Originally committed as revision 7095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 08:48:05 +00:00
Baptiste Coudurier
cbee7a6944 get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
Originally committed as revision 6954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-09 11:37:30 +00:00
Ryan Martell
31693e00fc Add support for getting duration of a RTP stream (for seeking in stream)
Patch by Ryan Martell % rdm4 A martellventures P com %
Original thread:
Date: Nov 6, 2006 6:39 PM
Subject: [Ffmpeg-devel] [PATCH] RTP/Get Duration of file (for seeking in stream)

Originally committed as revision 6921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-06 21:58:43 +00:00
Ryan Martell
d0deedcb07 fix more dynamic protocol stuff, needed by the forthcoming h264
streaming patch.
(Minor additions to give more information to the dynamic protocol
handlers, and a slight rearrangement of code.)
Patch by Ryan Martell %rdm4 A martellventures P com%
Original thread:
Date: Oct 29, 2006 2:30 AM
Subject: Re: [Ffmpeg-devel] RTP patches & RFC

Originally committed as revision 6831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-29 10:58:51 +00:00
Thijs
dbf30963f3 make ffmpeg able to send back a RTCP receiver report.
Patch by Thijs thijsvermeir A telenet P be
Original thread:
Date: Oct 27, 2006 12:58 PM
Subject: [Ffmpeg-devel] [PATCH proposal] RTCP receiver report

Originally committed as revision 6805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-27 18:19:29 +00:00
Ryan Martell
ed78754216 indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
Original thread:
Date: Oct 27, 2006 6:17 AM
Subject: Re: [Ffmpeg-devel] RTP patches & RFC

Originally committed as revision 6804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-27 17:51:20 +00:00
Ryan Martell
4934884a13 Add support for H264 over RTP
Patch by Ryan Martell % rdm4 A martellventures P com %
Original thread:
Date: Oct 9, 2006 4:55 PM
Subject: [Ffmpeg-devel] RTP patches & RFC
Actual committed patch:
Date: Oct 26, 2006 4:29 PM

Originally committed as revision 6798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-26 18:36:03 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Måns Rullgård
ff70e60176 allow individual selection of muxers and demuxers
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 21:14:37 +00:00
Måns Rullgård
d2a067d1d9 give AVInput/OutputFormat structs consistent names
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-09 23:40:53 +00:00
Stefan Huehner
7b49ce2e34 Add const to (mostly) char* and make some functions static, which aren't used
outside their declaring source file and which have no corresponding prototype.
patch by Stefan Huehner stefan^^@^^huehner^^.^^org

Originally committed as revision 5497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-18 11:33:14 +00:00
Michael Niedermayer
c04c3282b4 simplify AVFormatParameters NULL checks
Originally committed as revision 5146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-11 00:22:21 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00