[FFmpeg-cvslog] r17005 - in trunk: ffserver.c libavformat/rtsp.h

[rbultje]

Author: rbultje
Date: Thu Feb  5 18:00:10 2009
New Revision: 17005

Log:
Delete an enum and a function typedef that aren't used anywhere, and
move move a struct/typedef in rtsp.h that is only used in ffserver.c into
ffserver.c. See "[PATCH] rtsp.h: move/remove unused thingies" thread on ML.

Modified:
   trunk/ffserver.c
   trunk/libavformat/rtsp.h

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	Thu Feb  5 15:53:25 2009	(r17004)
+++ trunk/ffserver.c	Thu Feb  5 18:00:10 2009	(r17005)
@@ -103,6 +103,11 @@ static const char *http_state[] = {
 
 #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;

Modified: trunk/libavformat/rtsp.h
==============================================================================
--- trunk/libavformat/rtsp.h	Thu Feb  5 15:53:25 2009	(r17004)
+++ trunk/libavformat/rtsp.h	Thu Feb  5 18:00:10 2009	(r17005)
@@ -128,24 +128,6 @@ typedef struct RTSPStream {
     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);