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

put in ffmpeg version test

This commit is contained in:
Isaac Connor 2017-06-08 12:22:28 -04:00
parent d524f98d43
commit 02b2d8a968
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
distros/ubuntu1604/zoneminder.postinst
View File

@ -44,6 +44,11 @@ if [ "$1" = "configure" ]; then
# Ensure zoneminder is stopped # Ensure zoneminder is stopped
deb-systemd-invoke stop zoneminder.service || exit $? deb-systemd-invoke stop zoneminder.service || exit $?
zmupdate.pl --nointeractive zmupdate.pl --nointeractive
OLD_DIR_EVENTS=mysql -u $ZM_DB_USER --password="$ZM_DB_PASS" -h $ZM_DB_HOST -N -B $ZM_DB_NAME <<EOF
SELECT Value FROM Config WHERE Name='ZM_DIR_EVENTS';
EOF
echo "Value of ZM_DIR_EVENTS is $OLD_DIR_EVENTS ";
zmupdate.pl --nointeractive -f zmupdate.pl --nointeractive -f
echo "Done Updating, starting ZoneMinder" echo "Done Updating, starting ZoneMinder"
deb-systemd-invoke start zoneminder.service || exit $? deb-systemd-invoke start zoneminder.service || exit $?

2
src/zm_videostore.cpp
View File

@ -455,11 +455,13 @@ bool VideoStore::setup_resampler() {
// Now copy them to the output stream // Now copy them to the output stream
audio_output_stream = avformat_new_stream( oc, audio_output_codec ); audio_output_stream = avformat_new_stream( oc, audio_output_codec );
#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
ret = avcodec_parameters_from_context( audio_output_stream->codecpar, audio_output_context ); ret = avcodec_parameters_from_context( audio_output_stream->codecpar, audio_output_context );
if ( ret < 0 ) { if ( ret < 0 ) {
Error( "Could not initialize stream parameteres"); Error( "Could not initialize stream parameteres");
return false; return false;
} }
#endif
AVDictionary *opts = NULL; AVDictionary *opts = NULL;
av_dict_set( &opts, "strict", "experimental", 0); av_dict_set( &opts, "strict", "experimental", 0);