X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mux.cpp;fp=mux.cpp;h=ece11e117057167777023459bcc051e34b983c00;hb=e1a58f0f4e9cd05441f1e1b43fc4c83d1f862dd7;hp=161194ed3d98b65364ad1fa3fbb5c0ca508ca678;hpb=52f160780ff4462dcb23bc4cf4fec76ead511e64;p=nageru

diff --git a/mux.cpp b/mux.cpp
index 161194e..ece11e1 100644
--- a/mux.cpp
+++ b/mux.cpp
@@ -10,7 +10,7 @@
 
 using namespace std;
 
-Mux::Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const AVCodec *codec_audio, int time_base, int bit_rate, KeyFrameSignalReceiver *keyframe_signal_receiver)
+Mux::Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const AVCodecContext *audio_ctx, int time_base, KeyFrameSignalReceiver *keyframe_signal_receiver)
 	: avctx(avctx), keyframe_signal_receiver(keyframe_signal_receiver)
 {
 	AVCodec *codec_video = avcodec_find_encoder((video_codec == CODEC_H264) ? AV_CODEC_ID_H264 : AV_CODEC_ID_RAWVIDEO);
@@ -47,20 +47,13 @@ Mux::Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const
 		avstream_video->codec->flags = AV_CODEC_FLAG_GLOBAL_HEADER;
 	}
 
-	avstream_audio = avformat_new_stream(avctx, codec_audio);
+	avstream_audio = avformat_new_stream(avctx, nullptr);
 	if (avstream_audio == nullptr) {
 		fprintf(stderr, "avformat_new_stream() failed\n");
 		exit(1);
 	}
 	avstream_audio->time_base = AVRational{1, time_base};
-	avstream_audio->codec->bit_rate = bit_rate;
-	avstream_audio->codec->sample_rate = OUTPUT_FREQUENCY;
-	avstream_audio->codec->channels = 2;
-	avstream_audio->codec->channel_layout = AV_CH_LAYOUT_STEREO;
-	avstream_audio->codec->time_base = AVRational{1, time_base};
-	if (avctx->oformat->flags & AVFMT_GLOBALHEADER) {
-		avstream_audio->codec->flags = AV_CODEC_FLAG_GLOBAL_HEADER;
-	}
+	avcodec_copy_context(avstream_audio->codec, audio_ctx);
 
 	AVDictionary *options = NULL;
 	vector<pair<string, string>> opts = MUX_OPTS;