From 097ce5e778898e3b99a2c5f23e1eb3f86a742aa8 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 9 Sep 2019 17:09:01 -0400 Subject: [PATCH 1/2] add const to cast --- src/zm_videostore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp index 4d10fb67b..eda382077 100644 --- a/src/zm_videostore.cpp +++ b/src/zm_videostore.cpp @@ -654,7 +654,7 @@ bool VideoStore::setup_resampler() { #else // codec is already open in ffmpeg_camera audio_in_ctx = audio_in_stream->codec; - audio_in_codec = reinterpret_cast(audio_in_ctx->codec); + audio_in_codec = reinterpret_cast(audio_in_ctx->codec); //audio_in_codec = avcodec_find_decoder(audio_in_stream->codec->codec_id); #endif From 6c6b2d7c6f1185cb049b644e05d3859b5bf7beb2 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 9 Sep 2019 17:10:40 -0400 Subject: [PATCH 2/2] Fix build --- src/zm_videostore.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zm_videostore.h b/src/zm_videostore.h index 4c6dbf871..01dbc4d78 100644 --- a/src/zm_videostore.h +++ b/src/zm_videostore.h @@ -38,7 +38,7 @@ private: AVFrame *out_frame; AVCodecContext *video_in_ctx; - AVCodec *audio_in_codec; + const AVCodec *audio_in_codec; AVCodecContext *audio_in_ctx; // The following are used when encoding the audio stream to AAC