Pull the Mux class out of HTTPD. (First step towards decoupling file and HTTP muxing.)

[nageru] / h264encode.h

diff --git a/h264encode.h b/h264encode.h
index 0d70524e76d5a73d01977e1852a434a59280e947..43a56c609c147448d834751b5e81a89bcf9c1cdc 100644 (file)
--- a/h264encode.h
+++ b/h264encode.h
@@ -50,7 +50,7 @@ public:
 
        void add_audio(int64_t pts, std::vector<float> audio);
        bool begin_frame(GLuint *y_tex, GLuint *cbcr_tex);
-       void end_frame(RefCountedGLsync fence, int64_t pts, const std::vector<RefCountedFrame> &input_frames);
+       RefCountedGLsync end_frame(int64_t pts, const std::vector<RefCountedFrame> &input_frames);
        void shutdown();  // Blocking.
 
 private: