Unify muxing between the local file and networking.

[nageru] / h264encode.h

diff --git a/h264encode.h b/h264encode.h
index 48dd3291df457b1c2b8dbb7f3cdf6c380b848cc6..7a10d927ca84f94a7f8abc74fb7c6c7910b2e8d0 100644 (file)
--- a/h264encode.h
+++ b/h264encode.h
@@ -52,7 +52,7 @@ class QSurface;
 
 class H264Encoder {
 public:
-       H264Encoder(QSurface *surface, int width, int height, const char *output_filename, HTTPD *httpd);
+       H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd);
        ~H264Encoder();
        //void add_frame(FrameAllocator::Frame frame, GLsync fence);
 
@@ -109,9 +109,7 @@ private:
        std::map<int64_t, std::vector<float>> pending_audio_frames;  // under frame_queue_mutex
        QSurface *surface;
 
-       AVFormatContext *avctx;
-       AVStream *avstream_video;
-       AVStream *avstream_audio;
+       AVCodecContext *context_audio;
        HTTPD *httpd;
 };