[FFmpeg-devel] [PATCH] RDT/Realmedia patches #2

[Luca Barbato]

Ronald S. Bultje wrote:
> Hi,
> 
> On Tue, Sep 30, 2008 at 9:42 AM, Ronald S. Bultje <rsbultje at gmail.com> wrote:
>> On Tue, Sep 30, 2008 at 9:36 AM, Ronald S. Bultje <rsbultje at gmail.com> wrote:
>>> As always, my full applied patch-tree against trunk SVN is at [1], I
>>> hope you can see it shrinking over time.
>> [..]
>>> [1] http://www.gnome.org/~rbultje/ffmpeg-realmedia-rtsp/
>> And here's another one, which makes RTPDemuxContext opaque for
>> DynamicProtocolHandler functions. The advantage of this is that we
>> don't rely on DynamicProtocol* being limited to using RTPDemuxContext,
>> which would in a theoretical next patch (coming in 2 minutes)
> 
> And that patch is here.

Could you try to minimize it?

--- ffmpeg-svn.orig/libavformat/rtsp.c	2008-09-30 09:13:43.000000000 -0400
+++ ffmpeg-svn/libavformat/rtsp.c	2008-09-30 09:13:51.000000000 -0400
@@ -73,13 +73,13 @@
     enum RTSPLowerTransport lower_transport;
     enum RTSPServerType server_type;
     char last_reply[2048]; /* XXX: allocate ? */
-    RTPDemuxContext *cur_rtp;
+    void *cur_rtp;
     int need_subscription;
 } RTSPState;

 typedef struct RTSPStream {
     URLContext *rtp_handle; /* RTP stream handle */
-    RTPDemuxContext *rtp_ctx; /* RTP parse context */
+    void *rtp_ctx; /* RTP parse context */

why?

Index: ffmpeg-svn/libavformat/rtp.h
===================================================================
--- ffmpeg-svn.orig/libavformat/rtp.h	2008-09-30 09:06:29.000000000 -0400
+++ ffmpeg-svn/libavformat/rtp.h	2008-09-30 09:13:51.000000000 -0400
@@ -24,6 +24,8 @@
 #include "libavcodec/avcodec.h"
 #include "avformat.h"

+typedef struct RTPDynamicProtocolHandler_s RTPDynamicProtocolHandler;
+

Index: ffmpeg-svn/libavformat/rtp_internal.h
===================================================================
--- ffmpeg-svn.orig/libavformat/rtp_internal.h	2008-09-30
09:13:49.000000000 -0400
+++ ffmpeg-svn/libavformat/rtp_internal.h	2008-09-30 09:13:51.000000000
-0400
@@ -59,7 +59,7 @@
                                                 const uint8_t * buf,
                                                 int len, int flags);

-typedef struct RTPDynamicProtocolHandler_s {
+struct RTPDynamicProtocolHandler_s {

I'm not so sure it should go.

lu

-- 

Luca Barbato
Gentoo Council Member
Gentoo/linux Gentoo/PPC
http://dev.gentoo.org/~lu_zero