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

Merge branch 'master' into storageareas

pull/1624/head
Isaac Connor 2016-07-13 09:50:30 -04:00
parent 1e2ec7028e 59cc952cef
commit 8eac8a1e1a
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/zmfilter.pl.in
View File

@ -398,7 +398,7 @@ sub generateVideo
or Fatal( "Can't execute '$sql': ".$sth->errstr() );
if ( wantarray() )
{
return( $format, sprintf( "%s/%s", getEventPath( $event ), $output ) );
return( $format, $output );
}
}
return( 1 );

10
scripts/zmvideo.pl.in
View File

@ -231,6 +231,7 @@ foreach my $event_id ( @event_ids ) {
if ( $video_file ) {
Debug("Generated $video_file");
push @video_files, $video_file;
print( STDOUT $video_file."\n" );
}
} # end foreach event_id
@ -250,7 +251,7 @@ if ( $concat_name ) {
my $command = $Config{ZM_PATH_FFMPEG}
. " -f concat -i $concat_list_file -c copy "
.$Config{ZM_FFMPEG_OUTPUT_OPTIONS}
." '$video_file' > ffmpeg_${concat_name}.log 2>&1"
." '$video_file' > $Config{ZM_PATH_LOGS}/ffmpeg_${concat_name}.log 2>&1"
;
Debug( $command."\n" );
my $output = qx($command);
@ -259,12 +260,9 @@ if ( $concat_name ) {
unlink $concat_list_file;
if ( $status ) {
Error( "Unable to generate video, check /ffmpeg.log for details");
Error( "Unable to generate video, check $Config{ZM_PATH_LOGS}/ffmpeg_${concat_name}.log for details");
exit(-1);
}
print( STDOUT $video_file."\n" );
}
#unlink $input_file_list;
#print( STDOUT $event->{MonitorId}.'/'.$event->{Id}.'/'.$video_file."\n" );
#print( STDOUT $event_path . '/' . $video_file ."\n" );
#print( STDOUT $video_file."\n" );
exit( 0 );