Remove the redundant with_audio parameter from the Mux constructor.

[nageru] / shared / mux.h

diff --git a/shared/mux.h b/shared/mux.h
index 62cd37cf80791f061182ebf50498756948f24a78..c6b4c7e49420b316c44fbf827abf4b8954d04dbb 100644 (file)
--- a/shared/mux.h
+++ b/shared/mux.h
@@ -53,10 +53,6 @@ public:
                CODEC_NV12,  // Uncompressed 4:2:0.
                CODEC_MJPEG
        };
-       enum WithAudio {
-               WITH_AUDIO,
-               WITHOUT_AUDIO
-       };
        enum WriteStrategy {
                // add_packet() will write the packet immediately, unless plugged.
                WRITE_FOREGROUND,
@@ -74,7 +70,9 @@ public:
        // the just-written frame. (write_callback can be nullptr.)
        // Does not take ownership of <metrics>; elements in there, if any,
        // will be added to.
-       Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const std::string &video_extradata, const AVCodecParameters *audio_codecpar, AVColorSpace color_space, WithAudio with_audio, int time_base, std::function<void(int64_t)> write_callback, WriteStrategy write_strategy, const std::vector<MuxMetrics *> &metrics);
+       //
+       // If audio_codecpar is nullptr, there will be no audio stream.
+       Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const std::string &video_extradata, const AVCodecParameters *audio_codecpar, AVColorSpace color_space, int time_base, std::function<void(int64_t)> write_callback, WriteStrategy write_strategy, const std::vector<MuxMetrics *> &metrics);
        ~Mux();
        void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts, AVRational timebase = { 1, TIMEBASE }, int stream_index_override = -1);