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 16:55:34 -04:00
parent 9682edd080 792af28c54
commit 2bffc17594
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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<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
@ -1268,6 +1268,7 @@ int VideoStore::write_packet(AVPacket *pkt, AVStream *stream) {
} else { } else {
Debug(2, "Success writing packet"); Debug(2, "Success writing packet");
} }
return ret;
} // end int VideoStore::write_packet(AVPacket *pkt, AVStream *stream) } // end int VideoStore::write_packet(AVPacket *pkt, AVStream *stream)
int VideoStore::resample_audio() { int VideoStore::resample_audio() {