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

fix crash when not compiled with sws_resample

This commit is contained in:
Isaac Connor 2016-11-03 16:43:48 -04:00
parent 53166fabf5
commit dbd7d7d095
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_videostore.cpp
View File

@ -404,9 +404,11 @@ Debug(2, "Have audio_output_context");
} }
} // end if is AAC } // end if is AAC
if ( audio_output_stream ) {
if (oc->oformat->flags & AVFMT_GLOBALHEADER) { if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
audio_output_context->flags |= CODEC_FLAG_GLOBAL_HEADER; audio_output_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
} }
}
} else { } else {
Debug(3, "No Audio output stream"); Debug(3, "No Audio output stream");
@ -668,7 +670,7 @@ int VideoStore::writeAudioFramePacket( AVPacket *ipkt ) {
Debug(4, "writeAudioFrame"); Debug(4, "writeAudioFrame");
if(!audio_output_stream) { if(!audio_output_stream) {
Error("Called writeAudioFramePacket when no audio_output_stream"); Debug(1, "Called writeAudioFramePacket when no audio_output_stream");
return 0;//FIXME -ve return codes do not free packet in ffmpeg_camera at the moment return 0;//FIXME -ve return codes do not free packet in ffmpeg_camera at the moment
} }
/*if(!keyframeMessage) /*if(!keyframeMessage)