ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

This commit is contained in:
Isaac Connor 2019-09-09 17:11:25 -04:00
parent 2bffc17594 6c6b2d7c6f
commit 501b3a52fb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_videostore.cpp
View File

@ -654,7 +654,7 @@ bool VideoStore::setup_resampler() {
#else #else
// codec is already open in ffmpeg_camera // codec is already open in ffmpeg_camera
audio_in_ctx = audio_in_stream->codec; audio_in_ctx = audio_in_stream->codec;
audio_in_codec = reinterpret_cast<AVCodec *>(audio_in_ctx->codec); audio_in_codec = reinterpret_cast<const AVCodec *>(audio_in_ctx->codec);
//audio_in_codec = avcodec_find_decoder(audio_in_stream->codec->codec_id); //audio_in_codec = avcodec_find_decoder(audio_in_stream->codec->codec_id);
#endif #endif

2
src/zm_videostore.h
View File

@ -38,7 +38,7 @@ private:
AVFrame *out_frame; AVFrame *out_frame;
AVCodecContext *video_in_ctx; AVCodecContext *video_in_ctx;
AVCodec *audio_in_codec; const AVCodec *audio_in_codec;
AVCodecContext *audio_in_ctx; AVCodecContext *audio_in_ctx;
// The following are used when encoding the audio stream to AAC // The following are used when encoding the audio stream to AAC