[FFmpeg-devel] [PATCH] RTSP alternate protocol 1/3

Michael Niedermayer michaelni
Sun Mar 2 01:45:10 CET 2008


On Thu, Feb 21, 2008 at 01:29:34AM +0100, Michael Niedermayer wrote:
> On Thu, Feb 14, 2008 at 08:58:21AM -0500, Ronald S. Bultje wrote:
> > Hi,
> > 
> > On Mon, Feb 11, 2008 at 8:20 AM, Benoit Fouet <benoit.fouet at purplelabs.com>
> > wrote:
> > 
> > > Ronald S. Bultje wrote:
> > > > attached patch moves the REQUEST RTSP step into a new function
> > > > (make_setup_request()). There's no functional changes. This is a
> > > requirement
> > > > for [2-3]/3.
> > > >
> > > > Index: ffmpeg/libavformat/rtsp.c
> > > > ===================================================================
> > > > --- ffmpeg.orig/libavformat/rtsp.c    2008-01-04 08:40:39.000000000-0500
> > > > +++ ffmpeg/libavformat/rtsp.c 2008-02-09 10:03:20.000000000 -0500
> > >
> > [..]
> > 
> > > > @@ -930,7 +870,7 @@
> > > >          transport[0] = '\0';
> > > >
> > > >          /* RTP/UDP */
> > > > -        if (protocol_mask & (1 << RTSP_PROTOCOL_RTP_UDP)) {
> > > > +        if (protocol & (1 << RTSP_PROTOCOL_RTP_UDP)) {
> > > >
> > >
> > > cosmetics (renaming could be done later)
> > 
> > 
> > OK, it's separate now (see separate thread).
> > 
> > [..]
> > 
> > > > +        } else {
> > > > +           av_log(NULL, AV_LOG_ERROR, "Unknown protocol %d\n",
> > > protocol);
> > > > +           err = -1;
> > > > +           goto fail;
> > > >
> > >
> > > I think this is a functionnal change
> > > (and maybe you could directly return from here, though I don't know what
> > > is prefered)
> > 
> > 
> > I removed it, it's not needed, it was for making sure I didn't screw up in
> > the protocol_mask -> protocol change.
> > 
> > 
> > > >          }
> > > > +
> > > >
> > >
> > > cosmetics
> > 
> > 
> > Also fixed.
> > 
> > New patch attached.
> 
> Ping rtsp maintainer!
> anyway the patch looks ok IMHO

The patch can be applied, if it passes some minimal checks (regression &
something rtsp)

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Concerning the gods, I have no means of knowing whether they exist or not
or of what sort they may be, because of the obscurity of the subject, and
the brevity of human life -- Protagoras
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20080302/1d595c6f/attachment.pgp>



More information about the ffmpeg-devel mailing list