diff options
| -rw-r--r-- | ffserver.c | 5 | ||||
| -rw-r--r-- | libavformat/rtsp.h | 18 |
2 files changed, 5 insertions, 18 deletions
diff --git a/ffserver.c b/ffserver.c index 1fc3e656c2..8bfea66c2a 100644 --- a/ffserver.c +++ b/ffserver.c @@ -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; diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 83d7626106..83d0a39184 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -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); |