[FFmpeg-devel] [PATCH] rtsp.h: move/remove unused thingies

[Ronald S. Bultje]

Hi,

See $subj. Whatever is used only in ffserver.c was moved to ffserver.c
and whatever wasn't used at all was removed.

Ronald
-------------- next part --------------
Index: ffmpeg-svn/ffserver.c
===================================================================
--- ffmpeg-svn.orig/ffserver.c	2009-02-01 08:28:57.000000000 -0500
+++ ffmpeg-svn/ffserver.c	2009-02-05 09:08:00.000000000 -0500
@@ -103,6 +103,11 @@
 
 #define SYNC_TIMEOUT (10 * 1000)
 
+typedef struct RTSPActionServerSetup {
+    uint32_t ipaddr;
+    char transport_option[512];
+} RTSPActionServerSetup;
+
 typedef struct {
     int64_t count1, count2;
     int64_t time1, time2;
Index: ffmpeg-svn/libavformat/rtsp.h
===================================================================
--- ffmpeg-svn.orig/libavformat/rtsp.h	2009-02-05 09:06:37.000000000 -0500
+++ ffmpeg-svn/libavformat/rtsp.h	2009-02-05 09:10:28.000000000 -0500
@@ -128,24 +128,6 @@
     PayloadContext *dynamic_protocol_context; ///< Only valid if it's a dynamic protocol. (This is any private data associated with the dynamic protocol)
 } RTSPStream;
 
-/** the callback can be used to extend the connection setup/teardown step */
-enum RTSPCallbackAction {
-    RTSP_ACTION_SERVER_SETUP,
-    RTSP_ACTION_SERVER_TEARDOWN,
-    RTSP_ACTION_CLIENT_SETUP,
-    RTSP_ACTION_CLIENT_TEARDOWN,
-};
-
-typedef struct RTSPActionServerSetup {
-    uint32_t ipaddr;
-    char transport_option[512];
-} RTSPActionServerSetup;
-
-typedef int FFRTSPCallback(enum RTSPCallbackAction action,
-                           const char *session_id,
-                           char *buf, int buf_size,
-                           void *arg);
-
 int rtsp_init(void);
 void rtsp_parse_line(RTSPHeader *reply, const char *buf);