X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.h;fp=httpd.h;h=d5c805c0741f588df61e73ceecb999b3bcba0d01;hb=410a5fadcba336c918843cd55e1516cf4fe56abc;hp=e6f12d99698feae9d5cec1bd0d4c55d4fdbf2a02;hpb=d8795d38bc8d11ddbbb10037b653f3748aea35a6;p=nageru

diff --git a/httpd.h b/httpd.h
index e6f12d9..d5c805c 100644
--- a/httpd.h
+++ b/httpd.h
@@ -27,6 +27,8 @@ extern "C" {
 #include <libavformat/avio.h>
 }
 
+#include "mux.h"
+
 class HTTPD {
 public:
 	enum PacketDestination {
@@ -60,22 +62,6 @@ private:
 
 	void request_completed(struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe);
 
-	class Mux {
-	public:
-		enum Codec {
-			CODEC_H264,
-			CODEC_NV12,  // Uncompressed 4:2:0.
-		};
-
-		Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, int time_base);  // Takes ownership of avctx.
-		~Mux();
-		void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts);
-
-	private:
-		bool seen_keyframe = false;
-		AVFormatContext *avctx;
-		AVStream *avstream_video, *avstream_audio;
-	};
 
 	class Stream {
 	public: