diff --git a/src/zm_event.cpp b/src/zm_event.cpp index 5ddd255d2..a7e615f96 100644 --- a/src/zm_event.cpp +++ b/src/zm_event.cpp @@ -862,7 +862,6 @@ void Event::Run() { monitor->GetVideoStream(), monitor->GetVideoCodecContext(), ( monitor->RecordAudio() ? monitor->GetAudioStream() : nullptr ), - ( monitor->RecordAudio() ? monitor->GetAudioCodecContext() : nullptr ), monitor ); if (!videoStore->open()) { diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp index d94582964..8e88cfcc9 100644 --- a/src/zm_videostore.cpp +++ b/src/zm_videostore.cpp @@ -43,7 +43,6 @@ VideoStore::VideoStore( AVStream *p_video_in_stream, AVCodecContext *p_video_in_ctx, AVStream *p_audio_in_stream, - AVCodecContext *p_audio_in_ctx, Monitor *p_monitor ) : chosen_codec_data(nullptr), @@ -57,6 +56,8 @@ VideoStore::VideoStore( video_in_stream(p_video_in_stream), audio_in_stream(p_audio_in_stream), audio_in_codec(nullptr), + // Opened in open() from audio_in_stream's codecpar, not handed in. The + // caller used to pass a context as well and this ignored it. audio_in_ctx(nullptr), audio_out_codec(nullptr), audio_out_ctx(nullptr), diff --git a/src/zm_videostore.h b/src/zm_videostore.h index bca94d39e..bf5a7181a 100644 --- a/src/zm_videostore.h +++ b/src/zm_videostore.h @@ -138,7 +138,6 @@ class VideoStore { AVStream *video_in_stream, AVCodecContext *video_in_ctx, AVStream *audio_in_stream, - AVCodecContext *audio_in_ctx, Monitor * p_monitor); ~VideoStore(); bool open();