Commit Graph
61 Commits
Author SHA1 Message Date
Ronald S. Bultje f23a9759ce Remove check for @ in tcp.c which removes the authorization data from the
actual hostname. This functionality already exists (and always existed) in
url_split() and is therefore useless. See discussion in "[PATCH] tcp.c/udp.c
memleak?" thread on ffmpeg-devel.

Originally committed as revision 14946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 16:22:40 +00:00
Ronald S. Bultje a3303add3c Cosmetics after previous patches.
Originally committed as revision 14926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 18:52:26 +00:00
Ronald S. Bultje 8b9af28da4 On failure, return directly because the fail: case does nothing. This also
allows easier control of the actual return value.

Originally committed as revision 14925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 18:49:16 +00:00
Ronald S. Bultje 47f944a2ef Move malloc() down until after all initializations, so that the resource is
only allocated if initialization worked. This means that on failure, we
don't have to deallocate it.

Originally committed as revision 14924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 18:46:30 +00:00
Ronald S. Bultje e6c1381982 Fix memleak on some OSes in case network initialization fails. See
"[PATCH] tcp.c/udp.c memleak?" for discussion.

Originally committed as revision 14923 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 17:39:56 +00:00
Ronald S. Bultje ad33bfefc7 Remove useless comments. See "[PATCH] tcp.c/udp.c memleak?" for discussion.
Originally committed as revision 14922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 17:39:10 +00:00
Ronald S. Bultje ba99cfc213 Implement url_open_protocol(), which is basiclly the former url_open()
but which opens a URLProtocol instead of a filename. url_open() is
reimplemented to call url_open_protocol(). See discussion on
"url_open_protocol" on ffmpeg-devel.

Originally committed as revision 14857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 23:44:23 +00:00
Ronald S. Bultje 3f3fe38d25 Set AVStream.discard, so that demuxers can choose which stream to select if that is a serverside option (as is the case for RTSP). See "Realmedia patch" thread on mailinglist.
Originally committed as revision 14825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 17:09:34 +00:00
Ronald S. Bultje 1e2802c5cf Reindent after r14059, see "[PATCH] allow empty params for
av_open_input_stream()".

Originally committed as revision 14060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-03 12:12:03 +00:00
Ronald S. Bultje e145ce2027 Allow NULL for read_header in AVInputFormat. See discussion in "[PATCH] allow
empty params for av_open_input_stream()".

Originally committed as revision 14059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-03 12:10:54 +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 f841a0fca1 Add a flags field to the RTPDynamicPayloadPacketHandlerProc (PKT_FLAG_*).
This can be used later by RDT to get the flags from the RTP packet and
use that for the RealMedia packet (such as whether this RTP packet
represents a keyframe or not). For discussion, see "[PATCH] Realmedia
/ RTSP (RDT)".

Originally committed as revision 11557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-18 20:48:32 +00:00
Ronald S. Bultje f739b36d16 Reindent after r11493 (always use parse_packet() vfunc in rtp_parse_packet()),
see "[PATCH] Realmedia / RTSP (RDT)" thread on ML.

Originally committed as revision 11494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-10 13:54:30 +00:00
Ronald S. Bultje b4e3330c12 Make rtp_parse_packet() always call the vfunc of the dynamic payload handler
if there is one. See "[PATCH] Realmedia / RTSP (RDT)" thread on ML.

Originally committed as revision 11493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-10 13:52:35 +00:00
Ronald S. BultjeandBenoit Fouet 0fd36362b8 Make three rm demuxer functions non static.
Patch by Ronald S. Bultje rsbultje gmail com
Original thread: [FFmpeg-devel] [PATCH] Realmedia / RTSP (RDT)
Date: 12/28/2007 10:19 PM

Originally committed as revision 11392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-04 13:00:47 +00:00
Ronald S. BultjeandDiego Biurrun 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
Ronald S. BultjeandDiego Biurrun b83a84242c Merge double-nested if into && condition.
patch by Ronald S. Bultje, rsbultje gmail com

Originally committed as revision 11374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-02 18:53:12 +00:00
Ronald S. BultjeandBenoit Fouet 5c470b910e Split ac3 byte swapping into a separate function.
Patch by Ronald S. Bultje: rsbultje gmail com
Original thread: Re: [FFmpeg-devel] [PATCH 4/6] rmdec.c: rm_ac3_swap_bytes()
Date: 11/05/2007 09:27 PM

Originally committed as revision 10964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-08 15:52:53 +00:00
Ronald S. BultjeandBenoit Fouet d4d1b5fbde Isolate caching of audio frames in its own function.
Patch by Ronald S. Bultje: rsbultje gmail com
Original thread: Re: [FFmpeg-devel] [PATCH 3/6] rmdec.c: ff_rm_retrieve_cache()
Date: 11/05/2007 09:25 PM

Originally committed as revision 10963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-08 15:14:37 +00:00
Ronald S. BultjeandBenoit Fouet 66911b1552 Change a stream indexer.
Patch by Ronald S. Bultje: rsbultje gmail com

Originally committed as revision 10962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-08 15:09:37 +00:00
Ronald S. BultjeandBenoit Fouet afd302fa62 Split out the packet parsing from the main function body in rmdec.c
into its own function
Patch by Ronald S. Bultje: rsbultje gmail com
Original thread: Re: [FFmpeg-devel] [PATCH 2/6] rmdec.c: ff_rm_parse_frame()
Date: 11/05/2007 09:23 PM

Originally committed as revision 10961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-08 15:07:34 +00:00
Ronald S. BultjeandBenoit Fouet 7e4b161188 Change parse indexer.
Patch by Ronald S. Bultje: rsbultje gmail com

Originally committed as revision 10960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-08 15:05:40 +00:00
Ronald S. BultjeandLuca Abeni 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
Ronald S. BultjeandBenoit Fouet ff1463dc37 Split out the MDPR chunk reading into its own function.
Patch by Ronald S. Bultje: rsbultje gmail com
Original thread:[FFmpeg-devel] [PATCH 1/6] rmdec.c: ff_rm_read_mdpr_codecdata()
Date: 11/05/2007 09:21 PM

Originally committed as revision 10934 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-06 16:02:33 +00:00
Ronald S. BultjeandLuca Abeni 51844e6cd2 Take the target address family in account when determining the family of
the local address to bind.
Fixes ffserver and UDP streaming without --disable-ipv6 on MacOS X

Patch by Ronald S. Bultje (rsbultje st gmail dot com)

Originally committed as revision 10883 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-31 07:27:38 +00:00
Ronald S. BultjeandBenoit Fouet c5be140c9a Make url_split() strip url options (?opt=var) from the returned hostname or
location. This fixes a regression introduced by the rewrite of
url_split() in r10605.

Patch by Ronald S. Bultje: rsbultje gmail com
Original thread: [FFmpeg-devel] [PATCH] Make RTP work with IPv6 enabled
Date: 10/12/2007 08:19 PM

Originally committed as revision 10775 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 09:50:53 +00:00
Ronald S. BultjeandDiego Biurrun 3303926c2f Add checking for codecid to has_codec_parameters().
patch by Ronald S. Bultje, rsbultje gmail com
Date: Sat, 29 Sep 2007 09:25:52 -0400
Subject: [FFmpeg-devel] [PATCH] has_codec_parameters() addition

Originally committed as revision 10636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-01 22:11:10 +00:00
Ronald S. BultjeandDiego Biurrun b6cd8593b3 cmdutils.c uses FFMPEG_CONFIGURATION from config.h without directly including
config.h so that compilation without HAVE_AV_CONFIG_H fails.
patch by Ronald S. Bultje, rsbultje gmail com

Originally committed as revision 10619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-29 19:27:11 +00:00
Ronald S. BultjeandAndreas Öman 55ffe9df2a Use emms_c() instead of ifdef
patch by: Ronald S. Bultje rsbultje a gmail d com

Originally committed as revision 10616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-29 15:09:34 +00:00
Ronald S. BultjeandAndreas Öman f8f88a42cf Add IPv6 support to url_split()
patch by: Ronald S. Bultje rsbultje a gmail d com
thread: "[PATCH] url_split() ipv6 support" at 2007/Sep/23 18:43

Originally committed as revision 10615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-29 14:35:52 +00:00
Ronald S. BultjeandAndreas Öman 7e1e297ee3 refactor url_split(), preparing for IPv6 support
patch by: Ronald S. Bultje rsbultje a gmail d com
thread: "[PATCH] url_split() ipv6 support" at 09/23/07 18:43

Originally committed as revision 10605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-27 19:18:07 +00:00
Ronald S. BultjeandDiego Biurrun 36cf20f5a6 Merge get_str() and get_str8() functions.
patch by Ronald S. Bultje, rsbultje gmail com

Originally committed as revision 9818 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-28 18:05:11 +00:00
Ronald S. BultjeandDiego Biurrun 28263f5f15 Fix get_str/get_str8() to also work if the target string is not long enough to
fit all data from the container string, and allow NULL as a string also to
simply skip the string altogether.
patch by Ronald S. Bultje, rsbultje gmail com

Originally committed as revision 9817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-28 18:02:19 +00:00
Ronald S. BultjeandDiego Biurrun 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
Ronald S. BultjeandBenoit Fouet 0f4e816582 to be able to compile without HAVE_AV_CONFIG_H
patch by Ronald S. Bultje: [rsbultje gmail com]
original thread: [FFmpeg-devel] ffmpeg.c/cmdutils.c compilation
date: 06/23/2007 03:15 AM

Originally committed as revision 9453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-02 07:43:23 +00:00
Ronald S. BultjeandBenoit Fouet 9de8e6acf9 remove ENABLE_SWSCALER conditions
patch by Ronald S. Bultje: [rsbultje gmail com]

Originally committed as revision 9435 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-26 16:13:44 +00:00
Ronald S. BultjeandBenoit Fouet 48961970f1 remove decode_be32/64 and replace them by AV_RB32/64
patch by Ronald S. Bultje: \ rbultje at ronald bitfreak net /

Originally committed as revision 9299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-13 08:24:22 +00:00
Ronald S. BultjeandDiego Biurrun 19ecf88288 Add a bounds check on AVProbeData input.
patch by Ronald S. Bultje, rbultje ronald.bitfreak net
thread:
Date: Sat, 09 Jun 2007 19:22:17 -0400
Subject: [FFmpeg-devel] lavf probing

Originally committed as revision 9275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-10 20:35:01 +00:00
Ronald S. BultjeandDiego Biurrun 097e1da470 Adapt to API changes, fix compilation.
patch by Ronald S. Bultje, rbultje ronald.bitfreak net

Originally committed as revision 9266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-10 13:54:11 +00:00
Ronald S. BultjeandDiego Biurrun 12807c8d87 Add some #includes to allow compilation without HAVE_AV_CONFIG_H.
taken from a patch by Ronald S. Bultje, rbultje ronald.bitfreak net

Originally committed as revision 9263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-09 17:52:16 +00:00
Ronald S. BultjeandDiego Biurrun bcbd6603dd emms --> emms_c, taken from a patch by Ronald Bultje
Originally committed as revision 9253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-07 21:31:26 +00:00
Ronald S. BultjeandDiego Biurrun 3d4e3e560f Use FFmpeg-specific CPU feature definitions.
taken from a patch by Ronald S. Bultje, rbultje ronald.bitfreak net
Date: Thu, 07 Jun 2007 08:57:46 -0400
Subject: Re: [FFmpeg-devel] [PATCH] Coremake support - ffmpeg_nommx.patch (1/1)
 - ffmpeg-nommx.patch (1/1) - ff-cputest-noavconfig.patch (1/1)

Originally committed as revision 9250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-07 17:18:01 +00:00
Ronald S. BultjeandDiego Biurrun ac237a2f5d Add CPU feature definitions for SSE3 and SSSE3.
taken from a patch by Ronald S. Bultje, rbultje ronald.bitfreak net
Date: Thu, 07 Jun 2007 08:57:46 -0400
Subject: Re: [FFmpeg-devel] [PATCH] Coremake support - ffmpeg_nommx.patch (1/1)
 - ffmpeg-nommx.patch (1/1) - ff-cputest-noavconfig.patch (1/1)

Originally committed as revision 9249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-07 16:58:08 +00:00
Ronald S. BultjeandDiego Biurrun d07026cd16 CPU feature definitions should always be available, not just when the
CPU feature is enabled.
taken from a patch by Ronald S. Bultje, rbultje ronald.bitfreak net
Date: Thu, 07 Jun 2007 08:57:46 -0400
Subject: Re: [FFmpeg-devel] [PATCH] Coremake support - ffmpeg_nommx.patch (1/1)
 - ffmpeg-nommx.patch (1/1) - ff-cputest-noavconfig.patch (1/1)

Originally committed as revision 9246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-07 16:15:20 +00:00
Ronald S. BultjeandDiego Biurrun ee3035f31e Fix compilation when MMX is disabled.
inspired by a patch by Ronald S. Bultje, rbultje ronald.bitfreak net

Originally committed as revision 9243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-07 15:30:54 +00:00
Ronald S. BultjeandDiego Biurrun 8e82f5048e emms --> emms_c, patch by Ronald S. Bultje, rbultje ronald.bitfreak net
reference thread:
Subject: Re: [FFmpeg-devel] [PATCH] Coremake support - ff-grab-emms_c.patch (1/1)
Date: Thu, 07 Jun 2007 09:01:44 -0400

Originally committed as revision 9236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-07 13:24:19 +00:00
Ronald S. BultjeandDiego Biurrun f3ab6d9146 Do not specify directories in #include path, -I flags take care of this.
taken from a patch by Ronald S. Bultje, rbultje ronald.bitfreak net

Originally committed as revision 9035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-16 09:56:30 +00:00
Ronald S. BultjeandDiego Biurrun b550bfaa61 Add libavcodec to compiler include flags in order to simplify header
include paths in the source files.
mostly from a patch by Ronald S. Bultje, rbultje ronald.bitfreak net

Originally committed as revision 9034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-16 09:51:45 +00:00
Ronald S. BultjeandDiego Biurrun ecb4a895b2 Properly initialize filesize during input buffer initialization.
patch by Ronald S. Bultje, rbultje ronald.bitfreak net

Originally committed as revision 8343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-12 14:51:18 +00:00
Ronald S. BultjeandGuillaume Poirier 167c553176 Close connection on EOF
this makes downloading some asx files from MS
streaming servers work again (they would hang on eos).
The http request header property connection:close is needed for _some_
1.1 HTTP servers to close the connection at the end of file.
patch by Ronald S. Bultje % rbultje A ronald P bitfreak P net%
Original thread:
Date: Mar 3, 2007 10:48 PM
Subject: [Ffmpeg-devel] [PATCH] close connection on end-of-file

Originally committed as revision 8221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-04 11:59:29 +00:00
Ronald S. BultjeandGuillaume Poirier a3fd2bd87d make HTTP MOVED messages also work in ffmpeg (302 is essentially the same as 303).
patch by "Ronald S. Bultje" % rbultje A ronald P bitfreak P net%
original thread:
Date: Mar 4, 2007 1:21 AM
Subject: [Ffmpeg-devel] http move

Originally committed as revision 8219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-04 11:52:46 +00:00
Ronald S. BultjeandGuillaume Poirier 68fcdbf1e5 Fix misbehaviour in url_fseek() when seeking fails.
The return value of the seek function is -1 on error, not -EPIPE (the return value in url_seek() if no seek function pointer is set)
Patch by Ronald S. Bultje % rbultje A ronald P bitfreak P net %
Original thread:
date: Dec 31, 2006 9:25 PM
subject: [Ffmpeg-devel] Re: [PATCH] file length handling

Originally committed as revision 7766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-30 10:48:39 +00:00
Ronald S. BultjeandGuillaume Poirier eabbae730c protect the size=seek(SEEK_END,-1)+1 results with an if (.. < 0), else the
return value may still end up being zero (if the seek returns -1, which is
e.g. what file.c will return on error), which is a valid (but incorrect)
filesize.
Patch by Ronald S. Bultje % rbultje A ronald P bitfreak P net %
Original thread:
date: Jan 2, 2007 2:11 AM
subject: [Ffmpeg-devel] Re: [PATCH] file length handling

Originally committed as revision 7765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-30 10:37:52 +00:00
Ronald S. BultjeandBaptiste Coudurier 8f42f5238e proper error handling in file size retrieval, patch by Ronald S. Bultje rbultje at ronald bitfreak net
Originally committed as revision 7736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-28 02:38:02 +00:00
Ronald S. BultjeandGuillaume Poirier 621810045c makes the filename member of the URLContext a pointer, so that the
structure can be extended in the future without breaking ABI.
patch by Ronald S. Bultje % rbultje A ronald P bitfreak P net %
Original thread:
Date: Jan 1, 2007 6:01 PM
Subject: [Ffmpeg-devel] make URLContext->filename a pointer

Originally committed as revision 7506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 22:07:19 +00:00
Ronald S. BultjeandGuillaume Poirier fb2b4fc50a add support for HTTP seeking
patch by Ronald S. Bultje % rbultje A ronald P bitfreak P net %
Original thread:
Date: Jan 4, 2007 5:42 AM
Subject: [Ffmpeg-devel] [PATCH/RFC] http seeking

Originally committed as revision 7505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 22:02:38 +00:00
Ronald S. BultjeandMichael Niedermayer 7dc1bea30f non-avc h264 stream problems patch by ("Ronald S. Bultje" rbultje, ronald bitfreak net)
Originally committed as revision 4368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-09 20:01:02 +00:00
Ronald S. BultjeandMichael Niedermayer c3775e542f fix global name conflicts patch by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
Originally committed as revision 2884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-13 23:04:37 +00:00