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

Merge ../ZoneMinder.master into storageareas

pull/1185/head
Isaac Connor 2016-09-26 11:01:52 -04:00
parent bd22d72e18 e4f0c83139
commit 06da04c5d7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_storage.cpp
View File

@ -64,7 +64,7 @@ Storage::Storage( unsigned int p_id ) {
if ( ! id ) {
if ( config.dir_events[0] != '/' ) {
// not using an absolute path. Make it one by appending ZM_PATH_WEB
snprintf( path, sizeof(path), "%s/%s", config.dir_events, staticConfig.PATH_WEB.c_str() );
snprintf( path, sizeof (path), "%s/%s", staticConfig.PATH_WEB.c_str( ), config.dir_events );
} else {
strncpy(path, config.dir_events, sizeof(path) );
}

4
src/zm_videostore.cpp
View File

@ -573,8 +573,8 @@ if ( 1 ) {
}
if ( opkt.dts != AV_NOPTS_VALUE ) {
int64_t max = audio_output_stream->cur_dts + !(oc->oformat->flags & AVFMT_TS_NONSTRICT);
if (audio_output_stream->cur_dts && audio_output_stream->cur_dts != AV_NOPTS_VALUE && max > opkt.dts) {
int64_t max = video_output_stream->cur_dts + !(oc->oformat->flags & AVFMT_TS_NONSTRICT);
if (video_output_stream->cur_dts && video_output_stream->cur_dts != AV_NOPTS_VALUE && max > opkt.dts) {
Warning("st:%d PTS: %"PRId64" DTS: %"PRId64" < %"PRId64" invalid, clipping\n", opkt.stream_index, opkt.pts, opkt.dts, max);
if( opkt.pts >= opkt.dts)
opkt.pts = FFMAX(opkt.pts, max);