[FFmpeg-devel] [PATCH 13/17] move FFServerInfo from publisher.h to httpd.h

Stephan Holljes klaxa1337 at googlemail.com
Thu Jun 28 03:51:13 EEST 2018


Signed-off-by: Stephan Holljes <klaxa1337 at googlemail.com>
---
 httpd.h     | 9 +++++++++
 publisher.h | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/httpd.h b/httpd.h
index a988916..1b2566e 100644
--- a/httpd.h
+++ b/httpd.h
@@ -72,6 +72,15 @@ struct HTTPDInterface {
     void (*shutdown)(void *server);
 };
 
+/* struct containing server and client info per client AVIOContext */
+
+struct FFServerInfo {
+    struct HTTPDInterface *httpd;
+    void *server;
+    struct HTTPClient *client;
+};
+
+
 /** Current HTTPDInterface implementation using lavformat */
 extern struct HTTPDInterface lavfhttpd;
 #endif
diff --git a/publisher.h b/publisher.h
index e07cb10..a873d09 100644
--- a/publisher.h
+++ b/publisher.h
@@ -42,15 +42,6 @@ enum State {
 };
 
 
-/* struct containing server and client info per client AVIOContext */
-
-struct FFServerInfo {
-    struct HTTPDInterface *httpd;
-    void *server;
-    struct HTTPClient *client;
-};
-
-
 struct Client {
     AVFormatContext *ofmt_ctx; // writable AVFormatContext, basically our tcp connection to the client
     AVFifoBuffer *buffer; // Client buffer of Segment references
-- 
2.18.0



More information about the ffmpeg-devel mailing list