ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas

pull/2077/head
Isaac Connor 2017-08-15 13:50:08 -04:00
parent 0775725a76 e24a2935d2
commit 0cac55cfab
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/zmaudit.pl.in
View File

@ -351,6 +351,10 @@ MAIN: while( $loop ) {
if ( ! defined( $fs_events->{$db_event} ) ) {
Debug("Event $db_event is not in fs.");
my $Event = new ZoneMinder::Event( $db_event );
if ( ! $Event->Id() ) {
Debug("Event $db_event is no longer in db. Filter probably deleted it while we were auditing.");
next;
}
if ( ! $Event->StartTime() ) {
Debug("Event $$Event{Id} has no start time. deleting it.");
if ( confirm() ) {

2
src/zm_ffmpeg_camera.cpp
View File

@ -292,7 +292,7 @@ int FfmpegCamera::OpenFfmpeg() {
} else if ( method == "rtpRtspHttp" ) {
ret = av_dict_set(&opts, "rtsp_transport", "http", 0);
} else {
Warning("Unknown method (%s)", method);
Warning("Unknown method (%s)", method.c_str() );
}
if ( ret < 0 ) {

12
src/zm_videostore.cpp
View File

@ -326,14 +326,10 @@ VideoStore::~VideoStore(){
while ( 1 ) {
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
// Put encoder into flushing mode
ret = avcodec_send_frame( audio_output_context, NULL );
if ( ret < 0 ) {
Error("Error sending flush to encoder (%d) (%s)", ret, av_err2str( ret ));
break;
}
avcodec_send_frame( audio_output_context, NULL );
ret = avcodec_receive_packet( audio_output_context, &pkt );
if ( ret < 0 ) {
if ( EOF != ret ) {
if ( AVERROR_EOF != ret ) {
Error("ERror encoding audio while flushing (%d) (%s)", ret, av_err2str( ret ));
}
break;
@ -869,12 +865,12 @@ int VideoStore::writeAudioFramePacket( AVPacket *ipkt ) {
//av_frame_unref( output_frame );
if ( ( ret = avcodec_receive_packet( audio_output_context, &opkt ) ) < 0 ) {
if ( EAGAIN == ret ) {
if ( AVERROR(EAGAIN) == ret ) {
// THe codec may need more samples than it has, perfectly valid
Debug( 3, "Could not recieve packet (error '%s')",
av_make_error_string(ret).c_str());
} else {
Error( "Could not recieve packet (error '%s')",
Error( "Could not recieve packet (error %d = '%s')", ret,
av_make_error_string(ret).c_str());
}
zm_av_packet_unref(&opkt);